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

Timestamp:

2019-10-08T22:31:06+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #18212, see #4088, see #4155 - don't override modified flag of deleted primitives after resolving a conflict

File:

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

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

@@ -323 +323 @@
     @Override
     public void onConflictsRemoved(ConflictCollection conflicts) {
-        Logging.info("1 conflict has been resolved.");
+        Logging.debug("1 conflict has been resolved.");
         refreshView();
     }