From 4ef2de60f7e2e6bc351838a3b43c55df6577c191 Mon Sep 17 00:00:00 2001
From: Francois Fleuret <francois@fleuret.org>
Date: Wed, 15 Apr 2009 09:41:38 +0200
Subject: [PATCH] Fixed merge conflict.

---
 REVISION_NUMBER | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/REVISION_NUMBER b/REVISION_NUMBER
index 87f6629..fba7ed5 100644
--- a/REVISION_NUMBER
+++ b/REVISION_NUMBER
@@ -1,5 +1 @@
-<<<<<<< HEAD:REVISION_NUMBER
 143
-=======
-142
->>>>>>> 38e62ee50d9f4b6f77a34f6841a2db635e2553df:REVISION_NUMBER
-- 
2.20.1