aboutsummaryrefslogtreecommitdiff
path: root/dev
diff options
context:
space:
mode:
authorMaxime Dénès2017-06-07 11:22:03 +0200
committerMaxime Dénès2017-06-07 11:22:03 +0200
commit3e29266b1e2dfb970ca77fb5910b6a5860d4ad1a (patch)
tree74fe759b10d442c05bf8bc68028d1543a6d461ef /dev
parent0a577d3c979af094ca00be3e7e323109c7e1f6ab (diff)
parent3d3867b4ba32f2bf705d2f8c7d38c9a934dbdb6a (diff)
Merge PR#669: Ssr merge
Diffstat (limited to 'dev')
-rw-r--r--dev/ci/ci-user-overlay.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/dev/ci/ci-user-overlay.sh b/dev/ci/ci-user-overlay.sh
index 398c127073..195ede6d00 100644
--- a/dev/ci/ci-user-overlay.sh
+++ b/dev/ci/ci-user-overlay.sh
@@ -25,8 +25,8 @@ echo $TRAVIS_PULL_REQUEST
echo $TRAVIS_BRANCH
echo $TRAVIS_COMMIT
-if [ $TRAVIS_PULL_REQUEST == "590" ] || [ $TRAVIS_BRANCH == "trunk+algebraic-matchingvar" ]; then
- mathcomp_CI_BRANCH=trunk+pr590-patvar
- mathcomp_CI_GITURL=https://github.com/herbelin/math-comp.git
+if [ $TRAVIS_PULL_REQUEST == "669" ] || [ $TRAVIS_BRANCH == "ssr-merge" ]; then
+ mathcomp_CI_BRANCH=ssr-merge
+ mathcomp_CI_GITURL=https://github.com/maximedenes/math-comp.git
fi