delete accidentally added line to .gitignore during conflict resolve (p…

…osquit0#186) posquit0@55d94d7
kamesh-a · Jul 8, 2019 · 4be6c21 · 4be6c21
1 parent d88fe91
commit 4be6c21
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -11,7 +11,6 @@
 ## Intermediate documents:
 *.dvi
 *-converted-to.*
-<<<<<<< HEAD
 
 ### Editor ###
 ## Vim & Emacs temp files: