clean up unmerged gitignore

This commit is contained in:
David Seus 2021-04-29 18:32:30 +02:00
commit d861d182ea

7
.gitignore vendored
View file

@ -6,18 +6,11 @@
*.fls
*.log
*.out
<<<<<<< HEAD
*.pdf
*.kate-swp
*.toc
=======
*.synctex.gz
# template.tex output
# move to *.pdf once manual is done
template.pdf
>>>>>>> upstream/master
# release tarballs
moderncv-*.tar.gz
*.gz