Merge branch 'master' of ssh://fleuret@login.idiap.ch/homes/fleuret/public/git/selector

[selector.git] / REVISION_NUMBER

diff --git a/REVISION_NUMBER b/REVISION_NUMBER
index 87f6629..492dff0 100644 (file)
--- a/REVISION_NUMBER
+++ b/REVISION_NUMBER
@@ -1,5 +1 @@
-<<<<<<< HEAD:REVISION_NUMBER
-143
-=======
-142
->>>>>>> 38e62ee50d9f4b6f77a34f6841a2db635e2553df:REVISION_NUMBER
+152