1 files changed, 3 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index f33db6c..03ffd40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,5 +13,8 @@ buch*.pdf
 *.toc
 .build/
 *.synctex.gz
+<<<<<<< HEAD:.gitignore
 *.DS_Store
+=======
+>>>>>>> a787d334bf167a0d878fde6b03369a8817bcf691:buch/.gitignore