|
Last change
on this file since 5299 was 5170, checked in by Don-vip, 12 years ago |
|
cleanup svn:mime-type properties preventing Java sources from being viewed as such on Trac
|
-
Property svn:eol-style
set to
native
|
|
File size:
353 bytes
|
| Line | |
|---|
| 1 | // License: GPL. For details, see LICENSE file.
|
|---|
| 2 | package org.openstreetmap.josm.gui.conflict.pair;
|
|---|
| 3 |
|
|---|
| 4 | import org.openstreetmap.josm.data.conflict.Conflict;
|
|---|
| 5 | import org.openstreetmap.josm.data.osm.OsmPrimitive;
|
|---|
| 6 |
|
|---|
| 7 | public interface IConflictResolver {
|
|---|
| 8 |
|
|---|
| 9 | void deletePrimitive(boolean deleted);
|
|---|
| 10 | void populate(Conflict<? extends OsmPrimitive> conflict);
|
|---|
| 11 |
|
|---|
| 12 | }
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
