From 1d966ae7d02cdfd97264a6a7a696d5ec66f83340 Mon Sep 17 00:00:00 2001
From: Amaury <amaury.joly@etu.univ-lyon1.fr>
Date: Sun, 3 May 2020 15:46:52 +0200
Subject: [PATCH] oupsi

---
 DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.cpp b/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.cpp
index 5e5a7a9..83d77eb 100644
--- a/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.cpp
+++ b/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.cpp
@@ -24,14 +24,10 @@ GestionJeu::GestionJeu()
 
 GestionJeu::~GestionJeu()
 {
-<<<<<<< HEAD
 	delete gTerrain;
 	delete gPlayer;
 	delete gMobs;
 	delete gCollision;
-=======
-	delete gMobs;
->>>>>>> origin/master
 }
 
 /**