<<<<<<< HEAD ### gradle ### .gradle /build/ !gradle/wrapper/gradle-wrapper.jar ### STS ### .settings/ .apt_generated .classpath .factorypath .project .settings .springBeans bin/ ### IntelliJ IDEA ### .idea *.iws *.iml *.ipr rebel.xml ### NetBeans ### nbproject/private/ build/ nbbuild/ dist/ nbdist/ .nb-gradle/ ### maven ### target/ *.war *.ear *.zip *.tar *.tar.gz ### logs #### /logs/ *.log ### temp ignore ### *.cache *.diff *.patch *.tmp *.java~ *.properties~ *.xml~ ### system ignore ### .DS_Store Thumbs.db Servers .metadata upload gen_code sc-register/src/main/resources/bootstrap.yml ======= # Compiled class file *.class # Log file *.log # BlueJ files *.ctxt # Mobile Tools for Java (J2ME) .mtj.tmp/ # Package Files # *.jar *.war *.nar *.ear *.zip *.tar.gz *.rar # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* >>>>>>> 564f836548335d03f823918a6b2eca3aa012724a