| Chunk |
|---|
| Conflicting content |
|---|
// adding or replacing the detail fragment using a
// fragment transaction.
final Bundle arguments = new Bundle();
<<<<<<< HEAD
arguments.putString(Client.ServerEntry.SERVER_ID, id);
=======
arguments.putString(ServerDetailFragment.ARG_ITEM_ID, id);
>>>>>>> 3da2c732f4f6854f3e857d9f71888ad5f9c68a38
TabListener.initTabs(this, arguments);
// final ServerDetailFragment fragment = new ServerDetailFragment(); |
| Solution content |
|---|
// adding or replacing the detail fragment using a
// fragment transaction.
final Bundle arguments = new Bundle();
arguments.putString(Client.ServerEntry.SERVER_ID, id);
TabListener.initTabs(this, arguments);
// final ServerDetailFragment fragment = new ServerDetailFragment(); |
| File |
|---|
| ServerListActivity.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
};
setListAdapter(adapter);
<<<<<<< HEAD
final String serverId = getArguments() == null ? null : getArguments().getString(Client.ServerEntry.SERVER_ID);
=======
final String serverId = getArguments() == null ? null : getArguments().getString(ServerDetailFragment.ARG_ITEM_ID);
>>>>>>> 3da2c732f4f6854f3e857d9f71888ad5f9c68a38
if (serverId != null)
getLoaderManager().initLoader(0, null, new LoaderCallbacks |
| Solution content |
|---|
};
setListAdapter(adapter);
final String serverId = getArguments() == null ? null : getArguments().getString(Client.ServerEntry.SERVER_ID);
if (serverId != null)
getLoaderManager().initLoader(0, null, new LoaderCallbacks |
| File |
|---|
| ServerStateFragment.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |