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

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