resolve merge conflicts

2019-10-06 20:08:55 +02:00
parent 6de9a1ba97 7cbe9ac12c
commit 2d02097aff
2409 changed files with 22044 additions and 12068 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ bin/
 *.class

 # Package Files #
+*.jar
 *.war
 *.ear