| Chunk |
|---|
| Conflicting content |
|---|
+ ":\n" + TimeAttackGameHandler.this.mGamesWon
+ "\n" + BlockBreakerActivity.this.mStringProperties.getProperty(UIConstants.LOST_LEVELS_TEXT_PROPERTY_KEY)
+ ":\n" + TimeAttackGameHandler.this.mGamesLost)
<<<<<<< HEAD
.setCancelable(true)
.setPositiveButton(BlockBreakerActivity.this.mStringProperties.getProperty(UIConstants.RESTART_PROPERTY_KEY),
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface pDialog, int pId) {
pDialog.dismiss();
TimeAttackGameHandler.this.requestRestart();
}
=======
.setCancelable(true)
.setPositiveButton(BlockBreakerActivity.this.mStringProperties.getProperty(UIConstants.RESTART_PROPERTY_KEY),
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface pDialog, int pId) {
//a restart has been requested
TimeAttackGameHandler.this.requestRestart();
pDialog.dismiss();
}
>>>>>>> 85c7ada68d224ae420a368f147209da48195a321
}
);
builder.create().show(); |
| Solution content |
|---|
+ ":\n" + TimeAttackGameHandler.this.mGamesWon
+ "\n" + BlockBreakerActivity.this.mStringProperties.getProperty(UIConstants.LOST_LEVELS_TEXT_PROPERTY_KEY)
+ ":\n" + TimeAttackGameHandler.this.mGamesLost)
<<<<<<< HEAD
.setCancelable(true)
.setPositiveButton(BlockBreakerActivity.this.mStringProperties.getProperty(UIConstants.RESTART_PROPERTY_KEY),
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface pDialog, int pId) {
pDialog.dismiss();
TimeAttackGameHandler.this.requestRestart();
}
=======
.setCancelable(true)
.setPositiveButton(BlockBreakerActivity.this.mStringProperties.getProperty(UIConstants.RESTART_PROPERTY_KEY),
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface pDialog, int pId) {
//a restart has been requested
TimeAttackGameHandler.this.requestRestart();
pDialog.dismiss();
}
>>>>>>> unstable
}
);
builder.create().show(); |
| File |
|---|
| BlockBreakerActivity.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method invocation |