001// License: GPL. For details, see LICENSE file. 002package org.openstreetmap.josm.gui.conflict.pair; 003 004import org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictDecisionType; 005 006/** 007 * This is the merge decision for a primitive. 008 * 009 * @see RelationMemberConflictDecisionType the same for relation members 010 */ 011public enum MergeDecisionType { 012 KEEP_MINE, 013 KEEP_THEIR, 014 UNDECIDED, 015}