X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=REVISION_NUMBER;h=87f6629c3f995d7b65379faeeea1186663f02338;hb=6bfacc5594cad8647f454cc3aab15068663d7bbb;hp=fba7ed526e434d8e4d615d8c9eca14f252c8a0f4;hpb=287c4f215525607851ea65c0c5887cabac16b43f;p=selector.git

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