<<<<<<< HEAD
|
######################################################################
|
# Build Tools
|
|
.gradle
|
/build/
|
!gradle/wrapper/gradle-wrapper.jar
|
|
target/
|
!.mvn/wrapper/maven-wrapper.jar
|
|
######################################################################
|
# IDE
|
|
### STS ###
|
.apt_generated
|
.classpath
|
.factorypath
|
.project
|
.settings
|
.springBeans
|
|
### IntelliJ IDEA ###
|
.idea
|
*.iws
|
*.iml
|
*.ipr
|
|
### JRebel ###
|
rebel.xml
|
|
### NetBeans ###
|
nbproject/private/
|
build/*
|
nbbuild/
|
dist/
|
nbdist/
|
.nb-gradle/
|
|
######################################################################
|
# Others
|
*.log
|
*.xml.versionsBackup
|
*.swp
|
|
!*/build/*.java
|
!*/build/*.html
|
!*/build/*.xml
|
=======
|
*.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*
|
>>>>>>> 9a3621236cdb0d73ca5d9c8f658e004c2a1dc2ec
|
