Update .gitignore

This commit is contained in:
Peter Berlich 2019-11-16 18:17:37 +01:00
parent d336840d98
commit 730eda7f66
1 changed files with 6 additions and 30 deletions

36
.gitignore vendored
View File

@ -1,33 +1,9 @@
<<<<<<< HEAD # Finder files
*.class ._*
.DS_Store
======= # Windows Explorer files
# Compiled class file Thumbs.db
*.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*
*.tmp *.tmp
@ -47,4 +23,4 @@ Backup of *.doc*
~$*.ppt* ~$*.ppt*
# Visio autosave temporary files # Visio autosave temporary files
*.~vsd* *.~vsd*