Changeset 7005 in josm for trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties
- Timestamp:
- 2014-04-26T17:39:23+02:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java
r6881 r7005 59 59 60 60 private void populate(OsmPrimitive my, OsmPrimitive their) { 61 model.populate(new Conflict< OsmPrimitive>(my, their));61 model.populate(new Conflict<>(my, their)); 62 62 } 63 63
Note:
See TracChangeset
for help on using the changeset viewer.