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

velimir · posquit0 · commit 4be6c213c863 · 2019-07-08T23:52:31.000+09:00
55d94d7
diff --git a/.gitignore b/.gitignore
@@ -11,7 +11,6 @@
 ## Intermediate documents:
 *.dvi
 *-converted-to.*
-<<<<<<< HEAD
 
 ### Editor ###
 ## Vim & Emacs temp files:
