From e4a569c4ad5f2d51a6e233adfa8ab2388da4cef0 Mon Sep 17 00:00:00 2001
From: RochesterX <trevorisaacmaze@gmail.com>
Date: Fri, 21 Feb 2025 17:29:28 -0500
Subject: [PATCH] Fix merge conflicts

---
 Assets/Scripts/GameManager.cs | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs
index a416099..619dc7f 100644
--- a/Assets/Scripts/GameManager.cs
+++ b/Assets/Scripts/GameManager.cs
@@ -1,22 +1,8 @@
-<<<<<<< Updated upstream
 using System.Collections.Generic;
-=======
-using Unity.VisualScripting;
->>>>>>> Stashed changes
 using UnityEngine;
 
 public class GameManager : MonoBehaviour
 {
-    public  startGame
-    { 
-        if GameMode = GameMode.freeForAll(
-        Start freeForAll)
-        if GameMode = GameMode.freeForAll(
-        Start freeForAll)
-        if GameMode = GameMode.freeForAll(
-        Start freeForAll);
-    }
-
     public enum GameMode
     {
         freeForAll,
@@ -39,4 +25,12 @@ public class GameManager : MonoBehaviour
             player.transform.position = spawnPosition;
         }
     }
+
+    public void StartGame()
+    {
+        if (gameMode == GameMode.freeForAll)
+        {
+            // Start free for all game
+        }
+    }
 }