From b62a5ce78fe6832fe702d5af565acf59def42a72 Mon Sep 17 00:00:00 2001
From: bohcstams <bohacs.tamas02@gmail.com>
Date: Sat, 18 May 2024 18:05:42 +0200
Subject: [PATCH] Resolve merge conflicts 3

---
 src/main/java/hu/bomboclat/Graphics/Drawer.java    | 2 +-
 src/main/java/hu/bomboclat/Graphics/GameFrame.java | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/hu/bomboclat/Graphics/Drawer.java b/src/main/java/hu/bomboclat/Graphics/Drawer.java
index 58142af..ae061ff 100644
--- 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
index f2aedb8..108b501 100644
--- 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);