fixed github bug

Assets/Scripts/GameManager/GameMaster.cs

@@ -12,20 +12,11 @@ using UnityEngine;
 public class GameMaster : MonoBehaviour
 {
     [Header("GameMaster")]
-<<<<<<< Updated upstream
     [SerializeField] private List<Player> Players = new List<Player>(); 
-    private void Start()
-    {
-
-    }
-=======
-    [SerializeField] private List<Player> Players = new List<Player>();
     [SerializeField] private int countOfRounds = 10;
 
     public GameObject localPlayer;
 
->>>>>>> Stashed changes
-
     private void Update()
     {
         if (Input.GetKeyDown(KeyCode.H))
@@ -41,13 +32,4 @@ public class GameMaster : MonoBehaviour
             Cursor.visible = false;
         }
     }
-<<<<<<< Updated upstream
-=======
-
-    
-
- 
-
-
->>>>>>> Stashed changes
 }

Assets/Scripts/GameManager/JoinLeaveManager.cs

@@ -5,9 +5,14 @@ public class JoinLeaveManager : MonoBehaviour
 {
     private NetworkManager networkManager;
 
-    public void Join(string ip, string username)
+    private void Start()
     {
         networkManager = GetComponent<NetworkManager>();
+    }
+
+    public void Join(string ip, string username)
+    {
+        
 
         Debug.Log("[JoinLeaveManager] Trying to join server: " + ip + " as " + username);
 
@@ -15,4 +20,9 @@ public class JoinLeaveManager : MonoBehaviour
         networkManager.networkAddress = ip;
         Debug.Log("[JoinLeaveManager] " + username + " joined the server: " + ip);
     }
+
+    public void Host()
+    {
+        networkManager.StartHost();
+    }
 }

Assets/Scripts/TestOfflineScene/HostBtnScript.cs

@@ -11,6 +11,6 @@ public class HostBtnScript : MonoBehaviour
 
     public void HostServer()
     {
-        NetworkClient.ConnectHost();
+        GameObject.Find("GameManager").GetComponent<JoinLeaveManager>().Host();
     }
 }

Assets/Scripts/TestOfflineScene/JoinBtnScript.cs

@@ -7,26 +7,19 @@ public class JoinBtnScript : MonoBehaviour
 {
     [SerializeField] private TMP_InputField inputIp;
     [SerializeField] private TMP_InputField inputUsername;
-<<<<<<< Updated upstream
-=======
+
     private JoinLeaveManager joinLeaveManager;
->>>>>>> Stashed changes
 
     private void Start()
     {
         gameObject.GetComponent<Button>().onClick.AddListener(JoinServer);
-<<<<<<< Updated upstream
-=======
+
         joinLeaveManager = GameObject.Find("GameManager").GetComponent<JoinLeaveManager>();
->>>>>>> Stashed changes
     }
 
     public void JoinServer()
     {
-<<<<<<< Updated upstream
         NetworkClient.Connect(inputIp.text);
-=======
         joinLeaveManager.Join(inputIp.text, inputUsername.text);        
->>>>>>> Stashed changes
     }
 }