Projects >> Osmand >>960ca8331a5a3d6964e9ae9032ca104e38660b22

Chunk
Conflicting content
					}
					osmBugsLayer.openBug(latitude, longitude);
				} else if (resId == R.string.poi_context_menu_delete) {
<<<<<<< HEAD
					LOG.debug("delete poi");
					new EditPoiFragment.ShowDeleteDialogAsyncTask(mapActivity)
							.execute((Amenity) selectedObj);
=======
//					new EditPoiFragment.ShowDeleteDialogAsyncTask(mapActivity)
//							.execute((Amenity) selectedObj);
					// TODO implement delete
					getPoiActions(mapActivity).showDeleteDialog((Amenity) selectedObj);
>>>>>>> c867505132554e0279c278dc714390e735f7aaac
				} else if (resId == R.string.poi_context_menu_modify) {
					LOG.debug("edit poi");
					EditPoiFragment.showEditInstance((Amenity) selectedObj, mapActivity);
Solution content
					}
					osmBugsLayer.openBug(latitude, longitude);
				} else if (resId == R.string.poi_context_menu_delete) {
					new EditPoiFragment.ShowDeleteDialogAsyncTask(mapActivity)
							.execute((Amenity) selectedObj);
				} else if (resId == R.string.poi_context_menu_modify) {
					EditPoiFragment.showEditInstance((Amenity) selectedObj, mapActivity);
File
OsmEditingPlugin.java
Developer's decision
Combination
Kind of conflict
Comment
Method invocation