Changeset 2624 in josm
- Timestamp:
- 2009-12-13T06:48:07+01:00 (15 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 1 added
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
r2512 r2624 15 15 16 16 import org.openstreetmap.josm.command.Command; 17 import org.openstreetmap.josm.command.ModifiedConflictResolveCommand; 17 18 import org.openstreetmap.josm.command.SequenceCommand; 18 19 import org.openstreetmap.josm.command.VersionConflictResolveCommand; … … 271 272 } 272 273 if (isResolvedCompletely()) { 273 commands.add( 274 new VersionConflictResolveCommand(my, their) 275 ); 274 commands.add(new VersionConflictResolveCommand(my, their)); 275 commands.add(new ModifiedConflictResolveCommand(my, their)); 276 276 } 277 277 }
Note:
See TracChangeset
for help on using the changeset viewer.