diff options
Diffstat (limited to '')
| -rw-r--r-- | .gitignore (renamed from buch/.gitignore) | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/buch/.gitignore b/.gitignore index 46764b7..03ffd40 100644 --- a/buch/.gitignore +++ b/.gitignore @@ -13,4 +13,8 @@ buch*.pdf *.toc .build/ *.synctex.gz +<<<<<<< HEAD:.gitignore +*.DS_Store +======= +>>>>>>> a787d334bf167a0d878fde6b03369a8817bcf691:buch/.gitignore |