Projects >> TrinityProject >>b16eb0b76c189adad565345d3ab307217f0a62a8

Chunk
Conflicting content 
import playn.core.Game;

import com.github.thomasahle.trainbox.trainbox.scenes.DemoScene;
<<<<<<< HEAD
=======
//import com.github.thomasahle.trainbox.trainbox.scenes.LevelChooserScene;
>>>>>>> 428ffb93401c7826d94cd019818ede83a75fa9e9
import com.github.thomasahle.trainbox.trainbox.scenes.LevelScene;
import com.github.thomasahle.trainbox.trainbox.scenes.LevelSelectScene;
import com.github.thomasahle.trainbox.trainbox.scenes.LoadingScene;
Solution content 
import playn.core.Game;

import com.github.thomasahle.trainbox.trainbox.scenes.DemoScene;
//import com.github.thomasahle.trainbox.trainbox.scenes.LevelChooserScene;
import com.github.thomasahle.trainbox.trainbox.scenes.LevelScene;
import com.github.thomasahle.trainbox.trainbox.scenes.LevelSelectScene;
import com.github.thomasahle.trainbox.trainbox.scenes.LoadingScene;
File
TrainBox.java
Developer's decision
Version 2
Kind of conflict
Comment