Updated .gitignore to follow pom.xml again
This commit is contained in:
parent
f129ed523b
commit
f55bc8b2c1
4
.gitignore
vendored
4
.gitignore
vendored
@ -3,9 +3,5 @@
|
|||||||
/bin/
|
/bin/
|
||||||
/.idea/
|
/.idea/
|
||||||
/.project
|
/.project
|
||||||
<<<<<<< HEAD
|
|
||||||
/.classpath
|
/.classpath
|
||||||
=======
|
|
||||||
/jeu-de-combat.iml
|
/jeu-de-combat.iml
|
||||||
/pom.xml
|
|
||||||
>>>>>>> branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user