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

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