projects
/
selector.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
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
aaacbe6
..
87f6629
100644
(file)
--- a/
REVISION_NUMBER
+++ b/
REVISION_NUMBER
@@
-1
+1,5
@@
+<<<<<<< HEAD:REVISION_NUMBER
+143
+=======
142
+>>>>>>> 38e62ee50d9f4b6f77a34f6841a2db635e2553df:REVISION_NUMBER