See #23081: NoSuchElementException in ConflictDialog.ResolveToAction#actionPerformed, fix extra indentation

taylor.smock · taylor.smock · commit 1dc266a4e926 · 2023-07-26T21:11:04.000Z
git-svn-id: https://josm.openstreetmap.de/svn/trunk@18784 0c6e7542-c601-0410-84e7-c038aed88b3b
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
@@ -536,7 +536,7 @@ public void actionPerformed(ActionEvent e) {
                     }
                 }
             }
-                UndoRedoHandler.getInstance().add(new SequenceCommand(name, commands));
+            UndoRedoHandler.getInstance().add(new SequenceCommand(name, commands));
             refreshView();
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -536,7 +536,7 @@ public void actionPerformed(ActionEvent e) {`
`536`	`536`	`}`
`537`	`537`	`}`
`538`	`538`	`}`
`539`		`- UndoRedoHandler.getInstance().add(new SequenceCommand(name, commands));`
	`539`	`+ UndoRedoHandler.getInstance().add(new SequenceCommand(name, commands));`
`540`	`540`	`refreshView();`
`541`	`541`	`}`
`542`	`542`	`}`