From e2abd326065aed9c811f0dbda20f82964cef33aa Mon Sep 17 00:00:00 2001
From: Qingping Hou <dave2008713@gmail.com>
Date: Wed, 31 Oct 2012 23:01:36 -0400
Subject: [PATCH] gitignore cleanup

---
 .gitignore | 2 --
 1 file changed, 2 deletions(-)

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