Changeset 2945 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/IConflictResolver.java

Timestamp:

06.02.2010 09:37:48 (2 years ago)

Author:

jttt

Message:

Improvements in conflicts gui

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/IConflictResolver.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/IConflictResolver.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.conflict.pair;
+
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
 public interface IConflictResolver {
 
     void deletePrimitive(boolean deleted);
+    void populate(OsmPrimitive my, OsmPrimitive their);
 
 }