Suppression des conflits dans GameManager.cs

T3-Unity/Assets/Scripts/GameManager.cs

-<<<<<<< HEAD
-using System.Collections;
-=======
 using System.Collections;
 using System.Collections.Generic;
->>>>>>> 7889a14421855517f354bdb859a5d0b1a8a79734
 using UnityEngine;
 using Mapbox.Unity.Map;
 using Mapbox.Examples;
@@ -97,4 +93,4 @@ public class GameManager : MonoBehaviour
         canvas.GetComponentInChildren<Transform>().gameObject.SetActive(false);
         locked = true;
     }
-}
+}
\ No newline at end of file