From 1ca9ed617fc635bf0c3afc1b0b24e9b0d6b988a6 Mon Sep 17 00:00:00 2001
From: Leon Wilzer <leon.wilzer@protonmail.com>
Date: Sun, 6 Nov 2022 22:32:44 +0100
Subject: [PATCH] idk

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 4f6a493..68c7a04 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 setup:
 	mkdir build
-<<<<<<< HEAD
+
 sheet0:
 	g++ src/sheet0.cpp -o ./build/sheet0
 	chmod +x build/sheet0