Fix merge conflicts

2025-02-21 17:29:28 -05:00
parent 7e133af521
commit e4a569c4ad
1 changed files with 8 additions and 14 deletions
--- 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
+        }
+    }
 }