Changeset 17524 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2021-02-22T13:59:25+01:00 (3 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
r17340 r17524 238 238 setTitle(trn("Conflict: {0} unresolved", "Conflicts: {0} unresolved", conflictsCount, conflictsCount) + 239 239 " ("+tr("Rel.:{0} / Ways:{1} / Nodes:{2}", 240 conflicts.get RelationConflicts().size(),241 conflicts.get WayConflicts().size(),242 conflicts.getN odeConflicts().size())+')');240 conflicts.getNumberOfRelationConflicts(), 241 conflicts.getNumberOfWayConflicts(), 242 conflicts.getNumberOfNodeConflicts())+')'); 243 243 } else { 244 244 setTitle(tr("Conflict"));
Note:
See TracChangeset
for help on using the changeset viewer.