Projects >> Osmand >>977c75af8f3b08993a2342dadd560df21f537071

Chunk
Conflicting content 
import net.osmand.osm.PoiCategory;
import net.osmand.osm.PoiType;
import net.osmand.osm.edit.Node;
<<<<<<< HEAD
import net.osmand.osm.edit.OSMSettings;
import net.osmand.osm.edit.OSMSettings.OSMTagKey;
import net.osmand.plus.OsmandApplication;
=======
>>>>>>> 0f4a05990773c75990c9b1130b66fe165eafeb98
import net.osmand.util.Algorithms;

import org.apache.commons.logging.Log;
Solution content 
import net.osmand.osm.PoiCategory;
import net.osmand.osm.PoiType;
import net.osmand.osm.edit.Node;
import net.osmand.osm.edit.OSMSettings;
import net.osmand.osm.edit.OSMSettings.OSMTagKey;
import net.osmand.plus.OsmandApplication;
import net.osmand.util.Algorithms;

import org.apache.commons.logging.Log;
File
EditPoiData.java
Developer's decision
Version 1
Kind of conflict
Import