[jhead/f13/master: 4/4] fix failed merge

[Adrian Reber]

commit d25a13b5a2af136804b575fc072304aed483e645
Author: Adrian Reber <adrian at lisas.de>
Date:   Wed Aug 4 21:02:35 2010 +0200

    fix failed merge

 .gitignore |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4806467..0b957ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-jhead-2.87.tar.gz
+jhead-2.90.tar.gz