| Chunk |
|---|
| Conflicting content |
|---|
AdapterView.AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
Tweet tweet = getContextItemTweet(info.position);
<<<<<<< HEAD
if (tweet == null) {
Log.w(TAG, "Selected item not available.");
return;
}
=======
>>>>>>> 460a2c0af6f82fec7e252498d73c4e586d823dd0
if (tweet.userId.equals(getApi().getUserId())){
menu.add(0, CONTEXT_DELETE_ID, 0, R.string.cmenu_delete); |
| Solution content |
|---|
AdapterView.AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
Tweet tweet = getContextItemTweet(info.position);
if (tweet.userId.equals(getApi().getUserId())){
menu.add(0, CONTEXT_DELETE_ID, 0, R.string.cmenu_delete); |
| File |
|---|
| TwitterActivity.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| If statement |