Changeset 5816 in josm for trunk/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java
- Timestamp:
- 2013-03-31T15:09:56+02:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java
r5266 r5816 27 27 /** 28 28 * constructor 29 * @param my my primitive (i.e. the primitive from the local dataset) 30 * @param their their primitive (i.e. the primitive from the server) 29 * @param conflict the conflict data set 31 30 */ 32 31 public ModifiedConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict) {
Note:
See TracChangeset
for help on using the changeset viewer.