Changeset 8061 in josm for trunk/src/org/openstreetmap/josm/gui/conflict

Timestamp:

2015-02-14T07:31:36+01:00 (9 years ago)

Author:

bastiK

Message:

see #11096 - strip .png

File:

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

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

@@ -87 +87 @@
      */
     protected final void loadIcons() {
-        mergeComplete = ImageProvider.get("dialogs", "valid.png" );
-        mergeIncomplete = ImageProvider.get("dialogs/conflict", "mergeincomplete.png" );
+        mergeComplete = ImageProvider.get("dialogs", "valid" );
+        mergeIncomplete = ImageProvider.get("dialogs/conflict", "mergeincomplete" );
     }