1 files changed, 22 insertions, 26 deletions
diff --git a/.gitignore b/.gitignore
index c795c9e7..570ed90e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,31 +1,27 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
+/target/
+!.mvn/wrapper/maven-wrapper.jar
 
-# ignore all bin directories
-# matches "bin" in any subfolder
-bin/
-
-# ignore all target directories
-target/
-src/main/webapp
-# ignore all files ending with ~
-*~ 
-
-.DS_Store
-
-._*
-
-.metadata
-# Eclipse stuff
-.settings/
+### STS ###
+.apt_generated
 .classpath
+.factorypath
 .project
-# Idea
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
 .idea
-debug-logs/
-.README.md.html
+*.iws
+*.iml
+*.ipr
 
-docs/Makefile
-docs/_build
-docs/conf.py
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+src/main/webapp/WEB-INF/classes/
+debug-logs/