| Chunk |
|---|
| Conflicting content |
|---|
final String label = LibraryTree.resource().getResource(resourceKey).getValue();
final MenuItem item = menu.add(0, id, Menu.NONE, label);
item.setOnMenuItemClickListener(this);
<<<<<<< HEAD
//item.setIcon(iconId);
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
=======
if (iconId != -1) {
item.setIcon(iconId);
}
>>>>>>> c5e567e860aa7efcbfde20f5828646731efd0fd4
return item;
}
|
| Solution content |
|---|
final String label = LibraryTree.resource().getResource(resourceKey).getValue();
final MenuItem item = menu.add(0, id, Menu.NONE, label);
item.setOnMenuItemClickListener(this);
if (iconId != -1) {
//item.setIcon(iconId);
}
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
return item;
}
|
| File |
|---|
| LibraryActivity.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Method invocation |