Changeset 6887 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java
- Timestamp:
- 2014-02-26T23:45:59+01:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java
r6883 r6887 12 12 13 13 import org.openstreetmap.josm.command.Command; 14 import org.openstreetmap.josm.command. CoordinateConflictResolveCommand;15 import org.openstreetmap.josm.command. DeletedStateConflictResolveCommand;14 import org.openstreetmap.josm.command.conflict.CoordinateConflictResolveCommand; 15 import org.openstreetmap.josm.command.conflict.DeletedStateConflictResolveCommand; 16 16 import org.openstreetmap.josm.data.conflict.Conflict; 17 17 import org.openstreetmap.josm.data.coor.LatLon;
Note:
See TracChangeset
for help on using the changeset viewer.