From b2ee1cadb898b4370178a6d0ed226ea2ba7bfe47 Mon Sep 17 00:00:00 2001
From: MrWarzo <jordan.pereira@etu.unistra.fr>
Date: Wed, 15 Dec 2021 15:44:47 +0000
Subject: [PATCH] Suppression des conflits dans GameManager.cs

---
 T3-Unity/Assets/Scripts/GameManager.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/T3-Unity/Assets/Scripts/GameManager.cs b/T3-Unity/Assets/Scripts/GameManager.cs
index 7599bf0..910fadd 100644
--- a/T3-Unity/Assets/Scripts/GameManager.cs
+++ b/T3-Unity/Assets/Scripts/GameManager.cs
@@ -1,9 +1,5 @@
-<<<<<<< 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
+}
-- 
GitLab