Changeset 2512 in josm for trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java

Timestamp:

2009-11-24T10:45:04+01:00 (14 years ago)

Author:

stoecker

Message:

i18n updated, fixed files to reduce problems when applying patches, fix #4017

File:

• trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java (modified) (4 diffs)

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

@@ -27 +27 @@
     private static final Logger logger = Logger.getLogger(TagConflictResolveCommand.class.getName());
 
-
     /** the conflict to resolve */
     private Conflict<OsmPrimitive> conflict;
@@ -34 +33 @@
     private final List<TagMergeItem> mergeItems;
 
-
     /**
      * replies the number of decided conflicts
-     * 
+     *
      * @return the number of decided conflicts
      */
@@ -52 +50 @@
     /**
      * constructor
-     * 
+     *
      * @param my  my primitive
      * @param their  their primitive
@@ -61 +59 @@
         this.mergeItems = mergeItems;
     }
-
 
     @Override