<<<<<<< HEAD <<<<<<< HEAD log .idea *.iml /target/ /bin/ .project .classpath /log/ .settings ======= ======= >>>>>>> fcf5118f9b1afbb845fb8a8d2a42391627b1ef1c # ---> Java *.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* <<<<<<< HEAD >>>>>>> 5228917df4d1b95b1f3713791d7ff219b3467b41 ======= >>>>>>> fcf5118f9b1afbb845fb8a8d2a42391627b1ef1c