Projects >> powertac-tournament-scheduler >>0a27eae0173b8a21f35fcde05afa9351dd27da82

Chunk
Conflicting content 
import org.powertac.tourney.scheduling.AgentLet;
import org.powertac.tourney.scheduling.MainScheduler;
import org.powertac.tourney.scheduling.Server;
<<<<<<< HEAD
import org.powertac.tourney.services.*;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
=======
import org.powertac.tourney.services.Database;
import org.powertac.tourney.services.RunBootstrap;
import org.powertac.tourney.services.RunGame;
import org.powertac.tourney.services.TournamentProperties;
>>>>>>> dccd200426f2cc84a3d828efd80f8c0895dbf258
import org.springframework.stereotype.Service;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Solution content 
import org.powertac.tourney.scheduling.AgentLet;
import org.powertac.tourney.scheduling.MainScheduler;
import org.powertac.tourney.scheduling.Server;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.powertac.tourney.services.Database;
import org.powertac.tourney.services.RunBootstrap;
import org.powertac.tourney.services.RunGame;
import org.powertac.tourney.services.TournamentProperties;
import org.springframework.stereotype.Service;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
File
Scheduler.java
Developer's decision
Combination
Kind of conflict
Import