aboutsummaryrefslogtreecommitdiff
path: root/dev/ci/user-overlays
diff options
context:
space:
mode:
authorThéo Zimmermann2020-05-14 12:50:52 +0200
committerThéo Zimmermann2020-05-14 12:51:07 +0200
commitefa36e61d6eb5421c3c16d66c6d390268892edf2 (patch)
treeb9fce2d32359ed28c074a4ebdb6c40ba93d479ed /dev/ci/user-overlays
parent26cd7d093822556fc919dc7e27cac0196f564fc2 (diff)
parent6f2b88649ec0c1e27befe7bcd2cdbec0ccee95d6 (diff)
Fix conflicts with latest master.
Diffstat (limited to 'dev/ci/user-overlays')
-rw-r--r--dev/ci/user-overlays/8808-herbelin-master+support-binder+term-in-abbrev.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/dev/ci/user-overlays/8808-herbelin-master+support-binder+term-in-abbrev.sh b/dev/ci/user-overlays/8808-herbelin-master+support-binder+term-in-abbrev.sh
new file mode 100644
index 0000000000..50eaf0b109
--- /dev/null
+++ b/dev/ci/user-overlays/8808-herbelin-master+support-binder+term-in-abbrev.sh
@@ -0,0 +1,6 @@
+if [ "$CI_PULL_REQUEST" = "8808" ] || [ "$CI_BRANCH" = "master+support-binder+term-in-abbrev" ]; then
+
+ elpi_CI_REF=master+adapt-coq8808-syndef-same-expressiveness-notation
+ elpi_CI_GITURL=https://github.com/herbelin/coq-elpi
+
+fi