Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java	(revision 1626)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java	(revision 1627)
@@ -141,5 +141,5 @@
         }
 
-        @Override
+        
         public void actionPerformed(ActionEvent arg0) {
             setVisible(false);
@@ -155,5 +155,5 @@
         }
 
-        @Override
+        
         public void actionPerformed(ActionEvent arg0) {
             Command cmd = resolver.buildResolveCommand();