From 730eda7f6620868019368a8ab051522efd2bd4ce Mon Sep 17 00:00:00 2001
From: Peter Berlich <berp@zhaw.ch>
Date: Sat, 16 Nov 2019 18:17:37 +0100
Subject: [PATCH] Update .gitignore

---
 .gitignore | 36 ++++++------------------------------
 1 file changed, 6 insertions(+), 30 deletions(-)

diff --git a/.gitignore b/.gitignore
index b1398dd..dcfa5f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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*
\ No newline at end of file