idk

2022-11-06 22:32:44 +01:00 · 2022-11-06 22:32:44 +01:00 · 1ca9ed617f
commit 1ca9ed617f
parent 730b8f2262
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 setup:
 	mkdir build
-<<<<<<< HEAD
+
 sheet0:
 	g++ src/sheet0.cpp -o ./build/sheet0
 	chmod +x build/sheet0