From 201ed7f07042218eef151b403c343d6309dd3883 Mon Sep 17 00:00:00 2001
From: Jonathan Hager <mail@hager-jonathan.de>
Date: Tue, 22 Nov 2022 21:33:49 +0100
Subject: [PATCH] Merge Konflikte behoben

---
 Makefile | 4 ++--
 main.c   | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index b5ebc08..a98a099 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-spiel: main.o sprite.o inputHandler.o isometricRenderer.o isometricMap.o tile.o
-	gcc -o spiel main.o sprite.o inputHandler.o isometricRenderer.o isometricMap.o tile.o -lraylib -lGL -lm -lpthread -ldl -lrt -lX11
+spiel: main.o sprite.o inputHandler.o isometricRenderer.o isometricMap.o tile.o list.o
+	gcc -o spiel main.o sprite.o inputHandler.o isometricRenderer.o isometricMap.o tile.o list.o -lraylib -lGL -lm -lpthread -ldl -lrt -lX11
 
 main.o: main.c
 	gcc -c main.c -lraylib -lGL -lm -lpthread -ldl -lrt -lX11
diff --git a/main.c b/main.c
index 2deedd9..0fb7c36 100644
--- a/main.c
+++ b/main.c
@@ -4,12 +4,9 @@
 #include "sprite.h"
 #include "inputHandler.h"
 #include "raymath.h"
-<<<<<<< HEAD
 #include "List/list.h"
-=======
 #include "isometricRenderer.h"
 #include "isometricMap.h"
->>>>>>> IsometricRenderer
 
 int main(){