From aaaa44761e6d75ea688f60b822e7e788cbaab905 Mon Sep 17 00:00:00 2001
From: I-Have-An-Issue <34550332+I-Have-An-Issue@users.noreply.github.com>
Date: Sun, 19 Feb 2023 03:11:05 -0500
Subject: [PATCH] w

---
 src/lua/gameserver.lua | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/lua/gameserver.lua b/src/lua/gameserver.lua
index 8d89161..ea5b9ba 100644
--- a/src/lua/gameserver.lua
+++ b/src/lua/gameserver.lua
@@ -156,10 +156,5 @@ end)
 
 
 
-<<<<<<< HEAD
 -- StartGame -- 
-=======
-------------------------------END START GAME SHARED SCRIPT--------------------------
-
->>>>>>> master
 game:GetService("RunService"):Run()