From 93221433e704e1c98cc84c55caefddb85c2d5717 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Sun, 23 Jun 2024 19:58:10 +0200
Subject: a

---
 client/scripts/map.gd | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'client/scripts/map.gd')

diff --git a/client/scripts/map.gd b/client/scripts/map.gd
index abbd4c92..b5e519a6 100644
--- a/client/scripts/map.gd
+++ b/client/scripts/map.gd
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 # Undercooked - a game about cooking
 # Copyright 2024 nokoe
 # Copyright 2024 tpart
@@ -18,7 +16,6 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 # 
 @tool
->>>>>>> c974879 ([skip-notice] Insert license notice EVERYWHERE!!)
 class_name Map
 extends Node3D
 
-- 
cgit v1.2.3-70-g09d2