Changeset 6316 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
- Timestamp:
- 2013-10-07T20:18:17+02:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
r6084 r6316 276 276 */ 277 277 public Command buildResolveCommand() { 278 ArrayList<Command> commands = new ArrayList<Command>();278 List<Command> commands = new ArrayList<Command>(); 279 279 280 280 if (tagMerger.getModel().getNumResolvedConflicts() > 0) {
Note:
See TracChangeset
for help on using the changeset viewer.