diff options
| author | Andreas Müller <andreas.mueller@ost.ch> | 2021-06-14 07:30:09 +0200 |
|---|---|---|
| committer | Andreas Müller <andreas.mueller@ost.ch> | 2021-06-14 07:30:09 +0200 |
| commit | dc7bd02ea96579011a101dd9faf5891d858618cd (patch) | |
| tree | 9af4c42070fb11545ecd394c1066e024729da765 /.gitignore | |
| parent | move .gitignore to the right place (diff) | |
| parent | Merge pull request #24 from LordMcFungus/master (diff) | |
| download | SeminarMatrizen-dc7bd02ea96579011a101dd9faf5891d858618cd.tar.gz SeminarMatrizen-dc7bd02ea96579011a101dd9faf5891d858618cd.zip | |
Merge branch 'master' of github.com:AndreasFMueller/SeminarMatrizen
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -13,5 +13,8 @@ buch*.pdf *.toc .build/ *.synctex.gz +<<<<<<< HEAD:.gitignore *.DS_Store +======= +>>>>>>> a787d334bf167a0d878fde6b03369a8817bcf691:buch/.gitignore |