Changeset 3766 in josm for trunk/src/org/openstreetmap

Timestamp:

2011-01-02T01:56:05+01:00 (14 years ago)

Author:

stoecker

Message:

fix help

File:

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

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

@@ -335 +335 @@
                 tr("Merging deleted primitives failed"),
                 JOptionPane.WARNING_MESSAGE,
-                HelpUtil.ht("/Dialog/ConflictResolution#MergingDeletedPrimitivesFailed")
+                HelpUtil.ht("/Dialog/Conflict#MergingDeletedPrimitivesFailed")
         );
     }