Changeset 5816 in josm for trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java

Timestamp:

2013-03-31T15:09:56+02:00 (11 years ago)

Author:

stoecker

Message:

javadoc fixes

File:

• trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java (modified) (1 diff)

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

@@ -25 +25 @@
     /**
      * constructor
-     * @param my  my primitive (i.e. the primitive from the local dataset)
-     * @param their their primitive (i.e. the primitive from the server)
+     * @param conflict the conflict data set
      */
     public VersionConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict) {