From f55bc8b2c1633678d8c18eb8506900c64cfee5fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Autin?=
 <francois.autin@etudiant.univ-rennes1.fr>
Date: Thu, 3 Jun 2021 14:59:02 +0200
Subject: [PATCH] Updated .gitignore to follow pom.xml again

---
 .gitignore | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1f01948..b31642e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,9 +3,5 @@
 /bin/
 /.idea/
 /.project
-<<<<<<< HEAD
 /.classpath
-=======
 /jeu-de-combat.iml
-/pom.xml
->>>>>>> branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git