Index: trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java	(revision 1910)
+++ trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java	(revision 1912)
@@ -20,12 +20,12 @@
     protected void populate() {
         Way w1 = new Way(1);
-          w1.addNode(new Node(10));
-          w1.addNode(new Node(11));
+        w1.addNode(new Node(10));
+        w1.addNode(new Node(11));
 
         Way w2 = new Way(1);
-          w2.addNode(new Node(10));
-          w2.addNode(new Node(11));
+        w2.addNode(new Node(10));
+        w2.addNode(new Node(11));
 
-       dialog.getConflictResolver().populate(w1, w2);
+        dialog.getConflictResolver().populate(w1, w2);
     }