Merge branch 'master' of github.com:posquit0/resume
Conflicts: .gitignore
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -11,6 +11,7 @@
|
||||
## Intermediate documents:
|
||||
*.dvi
|
||||
*-converted-to.*
|
||||
<<<<<<< HEAD
|
||||
|
||||
### Editor ###
|
||||
## Vim & Emacs temp files:
|
||||
|
Reference in New Issue
Block a user