| Chunk |
|---|
| Conflicting content |
|---|
Uri uri = ContentUris.withAppendedId(Notes.CONTENT_URI, id);
// Launch activity to view/edit the currently selected item
<<<<<<< HEAD
startActivity(new Intent(Intent.ACTION_EDIT, uri)
.putExtra("SEARCH_STRING", queryString));
=======
startActivity(new Intent(Intent.ACTION_EDIT, uri).putExtra("SEARCH_STRING", queryString));
>>>>>>> 81931e7a33bc9e0b7433e42d3956fce15a43ded0
}
}
|
| Solution content |
|---|
Uri uri = ContentUris.withAppendedId(Notes.CONTENT_URI, id);
// Launch activity to view/edit the currently selected item
startActivity(new Intent(Intent.ACTION_EDIT, uri)
.putExtra("SEARCH_STRING", queryString));
}
}
|
| File |
|---|
| SearchQueryResultsActivity.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |