Changeset 6887 in josm for trunk/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.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)

Location:

trunk/src/org/openstreetmap/josm/command/conflict

Files:

• . (added)
• ConflictResolveCommand.java (moved) (moved from trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java ) (1 diff)

trunk/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.command;
+package org.openstreetmap.josm.command.conflict;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.conflict.ConflictCollection;