From 5d8dbd548b2b1e6742172b1a3b5560ec99b279a1 Mon Sep 17 00:00:00 2001
From: Bastian <bastian.turtschin23@gmail.com>
Date: Tue, 18 Nov 2025 01:47:38 +0100
Subject: [PATCH] =?UTF-8?q?Merging=20Problem=20gel=C3=B6st?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/main.c b/main.c
index 4ef2f49..ed13cb4 100644
--- a/main.c
+++ b/main.c
@@ -7,11 +7,7 @@
 
 int main(int argc, char *argv[])
 {
-<<<<<<< HEAD
     //readImages("mnist_test.info2");
-=======
-    readImages("mnist_test.info2");
->>>>>>> a031bb0b7ae2ed27acbc26a3e70ad41c093e63d2
     
     const unsigned int windowWidth = 800;
     const unsigned int windowHeight = 600;
@@ -73,8 +69,4 @@ int main(int argc, char *argv[])
 
     return exitCode;
     
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> a031bb0b7ae2ed27acbc26a3e70ad41c093e63d2