Merge branch 'master' of github.com:posquit0/resume

Conflicts:
	.gitignore
This commit is contained in:
Posquit0.BJ
2015-01-18 17:46:13 +09:00
3 changed files with 25 additions and 0 deletions

1
.gitignore vendored
View File

@@ -11,6 +11,7 @@
## Intermediate documents:
*.dvi
*-converted-to.*
<<<<<<< HEAD
### Editor ###
## Vim & Emacs temp files: