Changeset 2301 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

Timestamp:

2009-10-24T07:30:45+02:00 (14 years ago)

Author:

Gubaer

Message:

fixed #3765: Unable to resolve conflict
Improved warning message for conflicting relation versions and added help page

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -46 +46 @@
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.SideButton;
-import org.openstreetmap.josm.gui.help.HelpBuilder;
+import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;