fix .gitignore bad merge

.gitignore

@@ -1,7 +1,24 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
+/target*
+/.classpath
+/.project
+/.settings
+/tomcat.*
+/.idea
+/bin
+/mainnetdb
+/mainnet.log
+/*.iml
+.classpath
+.project
+*.class
+target/
+mainnet.log/
+mainnetdb/
+bin/
+*.iri
+*.jar
+src/main/ixi/
+dependency-reduced-pom.xml
 
 
 # Created by https://www.gitignore.io/api/osx,linux,windows