Changeset 1682 in josm for trunk/src/org/openstreetmap/josm/io/OsmApi.java

Timestamp:

20.06.2009 09:31:00 (3 years ago)

Author:

Gubaer

Message:

removed old conflict resolution code
fixed bug in OsmApi (missing changeset initialization)

File:

• trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/OsmApi.java

@@ -307 +307 @@
      * @return list of processed primitives
      * @throws OsmTransferException if something is wrong
-     * @throws OsmTransferCancelledException  if the upload was cancelled by the user
      */
     public Collection<OsmPrimitive> uploadDiff(final Collection<OsmPrimitive> list) throws OsmTransferException {