Changeset 17333 in josm for trunk/src/org/openstreetmap/josm/command/conflict/VersionConflictResolveCommand.java
- Timestamp:
- 2020-11-23T16:28:11+01:00 (3 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/command/conflict/VersionConflictResolveCommand.java
r12726 r17333 60 60 (int) Math.max(myVersion, theirVersion) 61 61 ); 62 // update visib lity state62 // update visibility state 63 63 if (theirVersion >= myVersion) { 64 64 conflict.getMy().setVisible(conflict.getTheir().isVisible());
Note:
See TracChangeset
for help on using the changeset viewer.