gitignore cleanup

12 years ago · e2abd32606
parent 625de9b260
commit e2abd32606
1 changed files with 0 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,8 +4,6 @@ lua-*
 .reader.kpdfview.lua
 mupdf-thirdparty.zip
 djvulibre*
-<<<<<<< HEAD
-=======
 crash.log
 .vimrc
 git-rev