resolve conflicts

This commit is contained in:
David Seus 2021-04-30 21:09:28 +02:00
commit 5af8ecb614

8
.gitignore vendored
View file

@ -6,11 +6,11 @@
*.fls
*.log
*.out
*.pdf
*.kate-swp
*.synctex.gz
# template.tex output
# move to *.pdf once manual is done
template.pdf
# release tarballs
moderncv-*.tar.gz
examples/