Resolve merge conflicts 3

BME-MIT-IET · May 18, 2024 · b62a5ce · b62a5ce
1 parent 3e63a0b
commit b62a5ce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/hu/bomboclat/Graphics/Drawer.java b/src/main/java/hu/bomboclat/Graphics/Drawer.java
@@ -150,7 +150,7 @@ else if(wantsToChange != null && !first_option) {
                     repaint();
                 }
             }
-            
+
         }
 
         /**

diff --git a/src/main/java/hu/bomboclat/Graphics/GameFrame.java b/src/main/java/hu/bomboclat/Graphics/GameFrame.java
@@ -82,10 +82,10 @@ public GameFrame(String title) {
     private void initFrame() {
         this.setDefaultCloseOperation(EXIT_ON_CLOSE);
         this.setResizable(false);
-        //URL url = ClassLoader.getSystemResource("Graphics/Images/deserticon.jpg");
-        //Toolkit kit = Toolkit.getDefaultToolkit();
-        //Image img = kit.createImage(url);
-        //this.setIconImage(img);
+        // URL url = ClassLoader.getSystemResource("Graphics/Images/deserticon.jpg");
+        // Toolkit kit = Toolkit.getDefaultToolkit();
+        // Image img = kit.createImage(url);
+        // this.setIconImage(img);
         setLayout(new BorderLayout());
         this.getContentPane().setBackground(bgColor);
-Original file line number
+Diff line change
@@ Expand Up / @@ -150,7 +150,7 @@ else if(wantsToChange != null && !first_option) { @@
                         repaint();
                     }
                 }
             }
             /**
@@ Expand Down @@