.gitignore
@@ -1,11 +1,6 @@ <<<<<<< HEAD git*.class .idea/ ======= *.class >>>>>>> 2845789016bdae401d55b7d4f857f344d80c5c50 # Mobile Tools for Java (J2ME) .mtj.tmp/ # Package Files # @@ -13,9 +8,7 @@ *.war *.ear <<<<<<< HEAD target/ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* .DS_Store @@ -41,7 +34,4 @@ *.njsproj *.sln *.sw? ======= # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* >>>>>>> 2845789016bdae401d55b7d4f857f344d80c5c50
