Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/command/conflict/VersionConflictResolveCommand.java
- Timestamp:
- 2015-06-20T23:42:21+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/command/conflict/VersionConflictResolveCommand.java
r8456 r8510 56 56 conflict.getMy().setOsmId( 57 57 conflict.getMy().getId(), 58 (int) Math.max(myVersion, theirVersion)58 (int) Math.max(myVersion, theirVersion) 59 59 ); 60 60 // update visiblity state
Note:
See TracChangeset
for help on using the changeset viewer.