Changeset 10667 in josm

Timestamp:

2016-07-28T23:33:55+02:00 (8 years ago)

Author:

Don-vip

Message:

fix javadoc warning (missing override)

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

@@ -928 +928 @@
     }
 
+    @Override
     public void decideRemaining(MergeDecisionType decision) {
         if (!model.isFrozen()) {