Resolve merge conflict 6

BME-MIT-IET · May 18, 2024 · a06a7c9 · a06a7c9
1 parent 9919e84
commit a06a7c9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/hu/bomboclat/Graphics/Drawer.java b/src/main/java/hu/bomboclat/Graphics/Drawer.java
@@ -140,8 +140,8 @@ public void mouseClicked(MouseEvent e) {
                 else if(wantsToChange != null && first_option) {
                     in = getClosestField(e.getX(), e.getY());
                     first_option=false;
-                }
-                else if(wantsToChange != null && !first_option) {
+               }
+               else if(wantsToChange != null && !first_option) {
                    out = getClosestField(e.getX(), e.getY());
                    wantsToChange.ChangePump((Pipe)in, (Pipe)out);
                    wantsToChange=null;