Changeset 8291 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java
- Timestamp:
- 2015-04-29T01:44:01+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java
r7005 r8291 260 260 * @param decision the decision (must not be null) 261 261 * 262 * @throws IllegalArgumentException thrown,if decision is null263 */ 264 public void decideDeletedStateConflict(MergeDecisionType decision) throws IllegalArgumentException{262 * @throws IllegalArgumentException if decision is null 263 */ 264 public void decideDeletedStateConflict(MergeDecisionType decision) { 265 265 CheckParameterUtil.ensureParameterNotNull(decision, "decision"); 266 266
Note:
See TracChangeset
for help on using the changeset viewer.