mirror of
https://github.com/moderncv/moderncv.git
synced 2026-02-06 10:05:19 +01:00
resolve conflicts
This commit is contained in:
parent
c94015a626
commit
5af8ecb614
1 changed files with 4 additions and 4 deletions
8
.gitignore
vendored
8
.gitignore
vendored
|
|
@ -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/
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue