Changeset 113 in josm for src/org/openstreetmap/josm/gui/ConflictResolver.java
- Timestamp:
- 2006-07-17T02:47:02+02:00 (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/org/openstreetmap/josm/gui/ConflictResolver.java
r104 r113 161 161 162 162 if (this.conflicts.isEmpty()) 163 throw new RuntimeException( tr("No conflicts but in conflict list:\n{0}" ,Arrays.toString(conflicts.entrySet().toArray())));163 throw new RuntimeException("No conflicts but in conflict list:\n"+Arrays.toString(conflicts.entrySet().toArray())); 164 164 165 165 // have to initialize the JTables here and not in the declaration, because its constructor
Note:
See TracChangeset
for help on using the changeset viewer.