Changeset 2945 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

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

Author:

jttt

Message:

Improvements in conflicts gui

File:

• trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java

@@ -72 +72 @@
                 conflict.getMy().setDeleted(true);
             } else {
-                conflict.getMy().setDeleted(conflict.getTheir().isDeleted());
+                conflict.getMy().setDeleted(false);
             }
         } else