140 lines
1.8 KiB
Plaintext
140 lines
1.8 KiB
Plaintext
<<<<<<< HEAD
|
|
/target
|
|
/src/main/webapp/**/**.jar
|
|
/src/main/webapp/**/**.class
|
|
|
|
|
|
HELP.md
|
|
.gradle
|
|
build/
|
|
!gradle/wrapper/gradle-wrapper.jar
|
|
!**/src/main/**/build/
|
|
!**/src/test/**/build/
|
|
|
|
### STS ###
|
|
.apt_generated
|
|
.classpath
|
|
.factorypath
|
|
.project
|
|
.settings
|
|
.springBeans
|
|
.sts4-cache
|
|
bin/
|
|
!**/src/main/**/bin/
|
|
!**/src/test/**/bin/
|
|
|
|
### IntelliJ IDEA ###
|
|
.idea
|
|
*.iws
|
|
*.iml
|
|
*.ipr
|
|
out/
|
|
!**/src/main/**/out/
|
|
!**/src/test/**/out/
|
|
|
|
### NetBeans ###
|
|
/nbproject/private/
|
|
/nbbuild/
|
|
/dist/
|
|
/nbdist/
|
|
/.nb-gradle/
|
|
|
|
### VS Code ###
|
|
.vscode/
|
|
.vs/
|
|
=======
|
|
.idea/
|
|
/target
|
|
.metadata
|
|
bin/
|
|
tmp/
|
|
*.tmp
|
|
*.bak
|
|
*.swp
|
|
*~.nib
|
|
local.properties
|
|
.settings/
|
|
.loadpath
|
|
.recommenders
|
|
|
|
# External tool builders
|
|
.externalToolBuilders/
|
|
|
|
# Locally stored "Eclipse launch configurations"
|
|
*.launch
|
|
|
|
# PyDev specific (Python IDE for Eclipse)
|
|
*.pydevproject
|
|
|
|
# CDT-specific (C/C++ Development Tooling)
|
|
.cproject
|
|
|
|
# CDT- autotools
|
|
.autotools
|
|
|
|
# Java annotation processor (APT)
|
|
.factorypath
|
|
|
|
# PDT-specific (PHP Development Tools)
|
|
.buildpath
|
|
|
|
# sbteclipse plugin
|
|
.target
|
|
|
|
# Tern plugin
|
|
.tern-project
|
|
|
|
# TeXlipse plugin
|
|
.texlipse
|
|
|
|
# STS (Spring Tool Suite)
|
|
.springBeans
|
|
|
|
# Code Recommenders
|
|
.recommenders/
|
|
|
|
# Annotation Processing
|
|
.apt_generated/
|
|
.apt_generated_test/
|
|
|
|
# Scala IDE specific (Scala & Java development for Eclipse)
|
|
.cache-main
|
|
.scala_dependencies
|
|
.worksheet
|
|
|
|
# Uncomment this line if you wish to ignore the project description file.
|
|
# Typically, this file would be tracked if it contains build/dependency configurations:
|
|
#.project
|
|
|
|
.svn
|
|
=======
|
|
# ---> Java
|
|
# 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*
|
|
replay_pid*
|
|
|
|
logs/
|
|
.classpath
|
|
>>>>>>> a5c72c4540b2e04c7465cfc0f3e8dc86290a3ee1
|