Changeset 6069 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

Timestamp:

2013-07-17T00:01:07+02:00 (11 years ago)

Author:

stoecker

Message:

see #8853 remove tabs, trailing spaces, windows line ends, strange characters

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

@@ -135 +135 @@
         return targetDataSet.getPrimitiveById(targetId);
     }
-    
+
     protected void addConflict(Conflict<?> c) {
         c.setMergedMap(mergedMap);
@@ -221 +221 @@
         }
     }
-    
+
     private final void resetPrimitive(OsmPrimitive osm) {
         if (osm instanceof Way) {