Index: trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTestFT.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTestFT.java	(revision 10937)
+++ trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTestFT.java	(revision 10957)
@@ -32,5 +32,5 @@
 
     public void showDialog() {
-        dialog.setVisible(true);
+        dialog.showDialog();
     }