aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <andreas.mueller@ost.ch>2021-06-14 07:30:50 +0200
committerAndreas Müller <andreas.mueller@ost.ch>2021-06-14 07:30:50 +0200
commit802f2a44be8be4728fd55fc0ff5220785d965baa (patch)
treeda0ea3f3c5f72cb420bd468006d709123be9981a
parentMerge branch 'master' of github.com:AndreasFMueller/SeminarMatrizen (diff)
downloadSeminarMatrizen-802f2a44be8be4728fd55fc0ff5220785d965baa.tar.gz
SeminarMatrizen-802f2a44be8be4728fd55fc0ff5220785d965baa.zip
Merge IFS
Diffstat (limited to '')
-rw-r--r--.gitignore4
1 files changed, 1 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 03ffd40..cc64005 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,8 +13,6 @@ buch*.pdf
*.toc
.build/
*.synctex.gz
-<<<<<<< HEAD:.gitignore
*.DS_Store
-=======
->>>>>>> a787d334bf167a0d878fde6b03369a8817bcf691:buch/.gitignore
+