From 1dbb137d333bee4908b2a5c337267b466841a64f Mon Sep 17 00:00:00 2001
From: bob <lol@lol.com>
Date: Thu, 2 Jun 2022 13:27:27 -0400
Subject: [PATCH] Fixed Merge Conflicts

---
 src/SingleTile.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SingleTile.java b/src/SingleTile.java
index 2a85d39..d4c79df 100644
--- a/src/SingleTile.java
+++ b/src/SingleTile.java
@@ -16,6 +16,6 @@ public class SingleTile extends Tile {
         this.tileImage = tileImage;
     }
     public void draw(Graphics g){
-        g.drawImage(tileImage, x, y, length, length, null);
+        g.drawImage(tileImage, x-GamePanel.camera.x, y, length, length, null);
     }
 }