Changeset 8444 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java
- Timestamp:
- 2015-06-02T16:41:37+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java
r8291 r8444 109 109 CheckParameterUtil.ensureParameterNotNull(my, "my"); 110 110 CheckParameterUtil.ensureParameterNotNull(their, "their"); 111 if (! 111 if (!isFrozen()) 112 112 throw new IllegalArgumentException(tr("Merged nodes not frozen yet. Cannot build resolution command")); 113 113 List<RelationMember> entries = getMergedEntries();
Note:
See TracChangeset
for help on using the changeset viewer.