| Chunk |
|---|
| Conflicting content |
|---|
setContentView(mWhiteBoardView);
bindService(makeServiceIntent(), serviceConnection, 0);
<<<<<<< HEAD
mUndoManager.setContentView(mWhiteBoardView);
=======
>>>>>>> 5cb626201ee071a1b1c352f0c31d2d3831ad2346
}
private Intent makeServiceIntent() { |
| Solution content |
|---|
setContentView(mWhiteBoardView);
bindService(makeServiceIntent(), serviceConnection, 0);
}
private Intent makeServiceIntent() { |
| File |
|---|
| WhiteBoardActivity.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
case R.id.menu_save: save(); return true; <<<<<<< HEAD /*case R.id.menu_load: //loadFromSdCard(); return true;*/ ======= >>>>>>> 5cb626201ee071a1b1c352f0c31d2d3831ad2346 case R.id.menu_stroke_width: showDialog(STROKE_WIDTH_DIALOG_ID); return true; |
| Solution content |
|---|
case R.id.menu_save: save(); return true; case R.id.menu_stroke_width: showDialog(STROKE_WIDTH_DIALOG_ID); return true; |
| File |
|---|
| WhiteBoardActivity.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |