Lixfel 06960ffda7 Merge branch 'master' into recordSystem ... # Conflicts: # FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java # FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java		2020-11-01 16:11:00 +01:00
..
src/de/steamwar/fightsystem	Merge branch 'master' into recordSystem	2020-11-01 16:11:00 +01:00
pom.xml	Simplify multiversioning with removing fall-through code	2020-09-08 09:52:25 +02:00