Changeset 6887 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java

Timestamp:

2014-02-26T23:45:59+01:00 (10 years ago)

Author:

Don-vip

Message:

package refactoring of conflict commands => move all of them to new package command.conflict (some plugins have to be updated)

File:

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

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

@@ -16 +16 @@
 
 import org.openstreetmap.josm.command.Command;
-import org.openstreetmap.josm.command.ModifiedConflictResolveCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
-import org.openstreetmap.josm.command.VersionConflictResolveCommand;
+import org.openstreetmap.josm.command.conflict.ModifiedConflictResolveCommand;
+import org.openstreetmap.josm.command.conflict.VersionConflictResolveCommand;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.Node;