| Chunk |
|---|
| Conflicting content |
|---|
import org.apache.commons.logging.LogFactory;
import org.powertac.server.core.command.PublishTariffCommand;
import org.powertac.server.core.command.RevokeTariffCommand;
<<<<<<< HEAD
import org.powertac.server.core.command.UpdateTariffCommand;
=======
import org.powertac.server.core.domain.Broker;
>>>>>>> ea8dc6bf941213b9dea1311a41e71b6a95d41a71
public class AccountingService {
|
| Solution content |
|---|
import org.apache.commons.logging.LogFactory;
import org.powertac.server.core.command.PublishTariffCommand;
import org.powertac.server.core.command.RevokeTariffCommand;
import org.powertac.server.core.command.UpdateTariffCommand;
import org.powertac.server.core.domain.Broker;
public class AccountingService {
|
| File |
|---|
| AccountingService.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |