delete accidentally added line to .gitignore during conflict resolve (#186)

https://github.com/posquit0/Awesome-CV/commit/55d94d780e98ef5fe3cd65cac769755853c3f53f
2019-07-08 15:52:31 +01:00
parent d88fe9141e
commit 4be6c213c8
1 changed files with 0 additions and 1 deletions
@@ -11,7 +11,6 @@
 ## Intermediate documents:
 *.dvi
 *-converted-to.*
-<<<<<<< HEAD

 ### Editor ###
 ## Vim & Emacs temp files: