.gitignore
@@ -1,3 +1,4 @@ <<<<<<< HEAD # Compiled class file *.class @@ -7,12 +8,17 @@ # BlueJ files *.ctxt ======= *.class >>>>>>> cce85ae68e917f3422992c2e331347ed72b3cf22 # Mobile Tools for Java (J2ME) .mtj.tmp/ # Package Files # *.jar *.war <<<<<<< HEAD *.nar *.ear *.zip @@ -52,3 +58,9 @@ .vite/ /core/backend/ /classpath:substitule.json ======= *.ear # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* >>>>>>> cce85ae68e917f3422992c2e331347ed72b3cf22
