Update .gitignore
This commit is contained in:
parent
d336840d98
commit
730eda7f66
|
@ -1,33 +1,9 @@
|
|||
<<<<<<< HEAD
|
||||
*.class
|
||||
# Finder files
|
||||
._*
|
||||
.DS_Store
|
||||
|
||||
=======
|
||||
# Compiled class file
|
||||
*.class
|
||||
|
||||
# Log file
|
||||
*.log
|
||||
|
||||
# BlueJ files
|
||||
*.ctxt
|
||||
|
||||
>>>>>>> 48ee561645428ff48d44bf22aa7842719ae898e0
|
||||
# Mobile Tools for Java (J2ME)
|
||||
.mtj.tmp/
|
||||
|
||||
# Package Files #
|
||||
*.jar
|
||||
*.war
|
||||
*.ear
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
*.zip
|
||||
*.tar.gz
|
||||
*.rar
|
||||
>>>>>>> 48ee561645428ff48d44bf22aa7842719ae898e0
|
||||
|
||||
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
|
||||
hs_err_pid*
|
||||
# Windows Explorer files
|
||||
Thumbs.db
|
||||
|
||||
*.tmp
|
||||
|
||||
|
@ -47,4 +23,4 @@ Backup of *.doc*
|
|||
~$*.ppt*
|
||||
|
||||
# Visio autosave temporary files
|
||||
*.~vsd*
|
||||
*.~vsd*
|
Loading…
Reference in New Issue