001 // License: GPL. For details, see LICENSE file. 002 package org.openstreetmap.josm.gui.conflict.pair; 003 004 import org.openstreetmap.josm.data.conflict.Conflict; 005 import org.openstreetmap.josm.data.osm.OsmPrimitive; 006 007 public interface IConflictResolver { 008 009 void deletePrimitive(boolean deleted); 010 void populate(Conflict<? extends OsmPrimitive> conflict); 011 012 }