From: Francois Fleuret Date: Wed, 15 Apr 2009 07:41:38 +0000 (+0200) Subject: Fixed merge conflict. X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;h=4ef2de60f7e2e6bc351838a3b43c55df6577c191;p=selector.git Fixed merge conflict. --- 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