Changeset 9449 in josm
- Timestamp:
- 2016-01-14T19:03:28+01:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
r9440 r9449 540 540 541 541 class ResolveTpMyVersionAction extends ResolveToAction { 542 publicResolveTpMyVersionAction() {542 ResolveTpMyVersionAction() { 543 543 super(tr("Resolve to my versions"), tr("Resolves all unresolved conflicts to ''my'' version"), 544 544 MergeDecisionType.KEEP_MINE); … … 547 547 548 548 class ResolveToTheirVersionAction extends ResolveToAction { 549 publicResolveToTheirVersionAction() {549 ResolveToTheirVersionAction() { 550 550 super(tr("Resolve to their versions"), tr("Resolves all unresolved conflicts to ''their'' version"), 551 551 MergeDecisionType.KEEP_THEIR);
Note:
See TracChangeset
for help on using the changeset viewer.