Changeset 1627 in josm for trunk/src

Timestamp:

2009-05-29T19:23:57+02:00 (16 years ago)

Author:

ce

Message:

removed two @Override to make it compile with java 1.5

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java

@@ -141 +141 @@
         }
 
-        @Override
+        
         public void actionPerformed(ActionEvent arg0) {
             setVisible(false);
@@ -155 +155 @@
         }
 
-        @Override
+        
         public void actionPerformed(ActionEvent arg0) {
             Command cmd = resolver.buildResolveCommand();