resolved gitignore conflict

ywilkof · Oct 10, 2015 · 0870e5a · 0870e5a
2 parents 0db05e8 + 62cca49
commit 0870e5a
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,16 +2,24 @@
 *.classpath
 *.log
 log/
-
-# Package Files #
-#*.jar
-*.war
-*.ear
-/target
+target/
 
 .idea
 
 atlassian-ide-plugin.xml
 .idea/
 *.iml
 
+=======
+
+# 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*
+