Changeset 2198 in josm for trunk/src/org/openstreetmap/josm/data/conflict

Timestamp:

2009-09-27T16:29:21+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3249: Resolve conflicts between invisible and deleted primitives automatically

File:

• trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java

@@ -6 +6 @@
 /**
  * Represents a conflict between two {@see OsmPrimitive}s. It is represented as
- * a pair if {@see OsmPrimitive} where one element of the pair has the role <em>my</em>
+ * a pair of {@see OsmPrimitive}s where one element of the pair has the role <em>my</em>
  * and the other has the role <em>their</em>.
  * <ul>