From b053667d9e425d75bddf7a862cd32c01ac056d95 Mon Sep 17 00:00:00 2001
From: Tigran Aivazian <tigran@bibles.org.uk>
Date: Wed, 10 Oct 2012 19:49:50 +0100
Subject: [PATCH] Add git-rev file.

Conflicts:

	.gitignore
---
 .gitignore | 5 +++++
 1 file changed, 5 insertions(+)

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