Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java
- Timestamp:
- 2014-04-26T17:39:23+02:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java
r6715 r7005 38 38 } 39 39 40 Collection<OsmPrimitive> taggedPrimitives = new ArrayList< OsmPrimitive>();40 Collection<OsmPrimitive> taggedPrimitives = new ArrayList<>(); 41 41 for (OsmPrimitive p: merged) { 42 42 if (p.isTagged()) {
Note:
See TracChangeset
for help on using the changeset viewer.