| Chunk |
|---|
| Conflicting content |
|---|
import android.gameengine.icadroids.sound.GameSound; import android.gameengine.icadroids.sound.MusicPlayer; import android.gameengine.icadroids.tiles.GameTiles; <<<<<<< HEAD import android.graphics.Canvas; import android.graphics.Point; ======= >>>>>>> 2ca95493bf54725eec53282fcdae54d10096dbb7 import android.graphics.Rect; import android.hardware.Sensor; import android.hardware.SensorEvent; |
| Solution content |
|---|
import android.gameengine.icadroids.sound.GameSound; import android.gameengine.icadroids.sound.MusicPlayer; import android.gameengine.icadroids.tiles.GameTiles; import android.graphics.Point; import android.graphics.Rect; import android.hardware.Sensor; import android.hardware.SensorEvent; |
| File |
|---|
| GameEngine.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
// create GameThread in one place: the startThread method <<<<<<< HEAD touch = new TouchInput(); screenButtons = new OnScreenButtons(); ======= touch = new TouchInput(gameView); >>>>>>> 2ca95493bf54725eec53282fcdae54d10096dbb7 GameSound.initSounds(getAppContext()); |
| Solution content |
|---|
// create GameThread in one place: the startThread method touch = new TouchInput(); GameSound.initSounds(getAppContext()); |
| File |
|---|
| GameEngine.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |