Projects >> wheelmap-android >>c23a22bdc953218e357305ed529397c042043aeb

Chunk
Conflicting content 
					marker = dUnknown;
				}

<<<<<<< HEAD
				// 
				marker.setBounds(0, 0, marker.getIntrinsicWidth(), marker.getIntrinsicHeight()); 
=======
				//
				marker.setBounds(-6, -6, 6, 6);
				marker.setBounds(0, 0, marker.getIntrinsicWidth(),
						marker.getIntrinsicHeight());
>>>>>>> 6bc5ff198c96415e81731952f5ad68b91f31c480
				POIMapItem geoPoint = new POIMapItem(new GeoPoint(
						lat.intValue(), lng.intValue()), state, poiId, marker);
				addItem(geoPoint);
Solution content 
					marker = dUnknown;
				}

				marker.setBounds(0, 0, marker.getIntrinsicWidth(),
						marker.getIntrinsicHeight());
				POIMapItem geoPoint = new POIMapItem(new GeoPoint(
						lat.intValue(), lng.intValue()), state, poiId, marker);
				addItem(geoPoint);
File
POIsPaintedMapsforgeOverlay.java
Developer's decision
Combination
Kind of conflict
Comment
Method invocation