|
Last change
on this file was 12661, checked in by michael2402, 7 years ago |
|
Fix #14794: Add javadoc for gui/conflict/pair package.
|
-
Property svn:eol-style
set to
native
|
|
File size:
395 bytes
|
| Line | |
|---|
| 1 | // License: GPL. For details, see LICENSE file.
|
|---|
| 2 | package org.openstreetmap.josm.gui.conflict.pair;
|
|---|
| 3 |
|
|---|
| 4 | import org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictDecisionType;
|
|---|
| 5 |
|
|---|
| 6 | /**
|
|---|
| 7 | * This is the merge decision for a primitive.
|
|---|
| 8 | *
|
|---|
| 9 | * @see RelationMemberConflictDecisionType the same for relation members
|
|---|
| 10 | */
|
|---|
| 11 | public enum MergeDecisionType {
|
|---|
| 12 | KEEP_MINE,
|
|---|
| 13 | KEEP_THEIR,
|
|---|
| 14 | UNDECIDED,
|
|---|
| 15 | }
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
