Merge branch 'Course-à-pieds' of...

Merge branch 'Course-à-pieds' of https://git.iut-orsay.fr/projets-s4-2022/projet-unity into Course-à-pieds

Assets/Scenes/CourseAPieds/course à pied.unity.meta

 fileFormatVersion: 2
+<<<<<<< HEAD:Assets/Scenes/CourseAPieds/course à pied.unity.meta
 guid: 96cc04971e775d946b39cd60ced9dd6f
+=======
+guid: b7d0fd886f1eff545bd6bc16a1463e9d
+>>>>>>> e40edc2edc64f212fba2d11fa2a1e3d1cb49d94e:Assets/Scenes/CourseAPieds/sceneCheminPasAleatoire.unity.meta
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Scenes/CourseAPieds/sceneCheminPasAleatoire.unity

@@ -211,17 +211,25 @@ MonoBehaviour:
   m_GameObject: {fileID: 460623921}
   m_Enabled: 1
   m_EditorHideFlags: 0
+<<<<<<<< HEAD:Assets/Scenes/CourseAPieds/sceneCheminPasAleatoire.unity
   m_Script: {fileID: 11500000, guid: 2d1ade1b23e121a49afc591b8e28e1ef, type: 3}
+========
+  m_Script: {fileID: 11500000, guid: 86c7bfd105ba6e14180f833234cbc0b8, type: 3}
+>>>>>>>> e40edc2edc64f212fba2d11fa2a1e3d1cb49d94e:Assets/Scenes/CourseAPieds/sceneCourseAPied.unity
   m_Name: 
   m_EditorClassIdentifier: 
   depth: 20
   width: 256
   height: 256
+<<<<<<<< HEAD:Assets/Scenes/CourseAPieds/sceneCheminPasAleatoire.unity
   scale: 20
   offsetX: 100
   offsetY: 100
   mask:
   - {fileID: 2800000, guid: 60cf2f5a7c77f5842b8cadcb4e92be0d, type: 3}
+========
+  scale: 2
+>>>>>>>> e40edc2edc64f212fba2d11fa2a1e3d1cb49d94e:Assets/Scenes/CourseAPieds/sceneCourseAPied.unity
 --- !u!1 &705507993
 GameObject:
   m_ObjectHideFlags: 0