diff --git a/.gitignore b/.gitignore
index 115c9b5c2..0345cc573 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,6 @@ lua-*
 .reader.kpdfview.lua
 mupdf-thirdparty.zip
 djvulibre*
-<<<<<<< HEAD
-=======
 crash.log
 .vimrc
 git-rev