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

Timestamp:

2010-02-06T09:37:48+01:00 (15 years ago)

Author:

jttt

Message:

Improvements in conflicts gui

File:

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

trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java

@@ -717 +717 @@
         }
     }
+
+    public void populate(OsmPrimitive my, OsmPrimitive their) {
+        model.populate(my, their);
+    }
 }