Changeset 1677 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
- Timestamp:
- 17.06.2009 10:04:22 (3 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
r1652 r1677 193 193 /** 194 194 * removes a conflict registered for {@see OsmPrimitive} <code>my</code> 195 * 195 * 196 196 * @param my the {@see OsmPrimitive} for which a conflict is registered 197 197 * with this dialog … … 209 209 * by a pair of {@see OsmPrimitive} with differences in their tag sets, 210 210 * their node lists (for {@see Way}s) or their member lists (for {@see Relation}s) 211 * 211 * 212 212 * @param my my version of the {@see OsmPrimitive} 213 213 * @param their their version of the {@see OsmPrimitive}
Note: See TracChangeset
for help on using the changeset viewer.
