// License: GPL. For details, see LICENSE file.

/**
 * Provides the classes for edition {@link org.openstreetmap.josm.data.conflict.Conflict conflicts}
 * between {@link org.openstreetmap.josm.data.osm.OsmPrimitive OsmPrimitive}s
 */
package org.openstreetmap.josm.data.conflict;
