Changeset 5903 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes

Timestamp:

2013-04-25T17:57:04+02:00 (11 years ago)

Author:

stoecker

Message:

fix javadoc

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java

@@ -52 +52 @@
      * Builds the command to resolve conflicts in the node list of a way
      *
-     * @param my  my way. Must not be null.
-     * @param their  their way. Must not be null
+     * @param conflict the conflict data set
      * @return the command
      * @exception IllegalStateException thrown, if the merge is not yet frozen