Changeset 6881 in josm for trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java

Timestamp:

2014-02-24T17:49:12+01:00 (10 years ago)

Author:

Don-vip

Message:

javadoc/code style/minor refactorization

File:

• trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java

@@ -9 +9 @@
 
 import org.openstreetmap.josm.data.conflict.Conflict;
-import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
@@ -16 +15 @@
 
 /**
- * Represents a the resolution of a conflict between the coordinates of two {@link Node}s
+ * Represents the resolution of a conflict between the deleted flag of two {@link OsmPrimitive}s.
  *
  */