Fixed conflict on .gitignore

2014-09-30 22:22:28 +02:00
parent fa5b953010 acc1167fe1
commit af79794300
1 changed files with 12 additions and 0 deletions
@@ -22,3 +22,15 @@ broker/runner
 .classpath
 *.swp

+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*