Changeset 9230 in josm for trunk/src/org/openstreetmap/josm/data/conflict
- Timestamp:
- 2015-12-31T16:37:24+01:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java
r8846 r9230 17 17 * {@link OsmPrimitive} from the dataset in another layer or the one retrieved from the server.</li> 18 18 * </ul> 19 * 20 * 19 * @since 1750 21 20 */ 22 public class 21 public class Conflict<T extends OsmPrimitive> { 23 22 private final T my; 24 23 private final T their;
Note:
See TracChangeset
for help on using the changeset viewer.