Add git-rev file.

Conflicts: .gitignore
12 years ago · b053667d9e
parent 4b2a9237c9
commit b053667d9e
1 changed files with 5 additions and 0 deletions
--- 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