jeu-de-combat/.gitignore

/.settings/
/target/
/bin/
/.idea/
/.project
/.classpath
/jeu-de-combat.iml
Untracked .project 2021-05-28 02:56:38 +02:00			`/.settings/`
			`/target/`
			`/bin/`
			`/.idea/`
			`/.project`
Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git Conflicts: .gitignore 2021-06-03 14:58:37 +02:00			`/.classpath`
change dsome things inmatch, added the start of amain function. 2021-06-01 21:02:11 +02:00			`/jeu-de-combat.iml`