liyongde
9ddaabe33f
git-subtree-dir: lms git-subtree-mainline:6e59051fd0git-subtree-split:1d360075f1
38 lines
457 B
Plaintext
38 lines
457 B
Plaintext
<<<<<<< HEAD
|
|
### IDEA ###
|
|
*/*.log
|
|
.idea/*
|
|
*.iml
|
|
*/target/*
|
|
*/*.iml
|
|
/.gradle/
|
|
/target/*
|
|
*/application-dev.yml
|
|
=======
|
|
# ---> 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*
|
|
|
|
>>>>>>> 18ce5d210133a3763e002308fe1d91183994a785
|