Projects >> auctioneer >>a834828f44be9e47cb0818ba7a8d23723f559d60

Chunk
Conflicting content 
      for (PendingTrade trade : pendingTrades) {
        accountingService.addMarketTransaction(trade.from, timeslot,
                                               -trade.mWh, clearingPrice);
<<<<<<< HEAD
        accountingService.addMarketTransaction(trade.to, timeslot,
=======
        accountingService.addMarketTransaction(trade.to, timeslot, 
>>>>>>> ca489ac9d5695120a504170b10db7ca63e67c982
                                               trade.mWh, -clearingPrice);
      }
      // create the orderbook and cleared-trade, send to brokers
Solution content 
      for (PendingTrade trade : pendingTrades) {
        accountingService.addMarketTransaction(trade.from, timeslot,
                                               -trade.mWh, clearingPrice);
        accountingService.addMarketTransaction(trade.to, timeslot,
                                               trade.mWh, -clearingPrice);
      }
      // create the orderbook and cleared-trade, send to brokers
File
AuctionService.java
Developer's decision
Version 1
Kind of conflict
Method invocation