Update constraint for ppx_tools_versioned

ocsigen · Mar 29, 2017 · 54f9c47 · 54f9c47
1 parent 92a81f7
commit 54f9c47
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.jenkins.sh b/.jenkins.sh
@@ -1,4 +1,4 @@
-opam pin add jbuilder https://github.com/janestreet/jbuilder.git
+#opam pin add jbuilder https://github.com/janestreet/jbuilder.git
 
 opam pin add --no-action js_of_ocaml .
 opam pin add --no-action js_of_ocaml-compiler .

diff --git a/js_of_ocaml-ppx.opam b/js_of_ocaml-ppx.opam
@@ -22,7 +22,7 @@ depends: [
 depopts: ["ppx_deriving" "ppx_tools"]
 
 conflicts: [
-  "ppx_tools_versioned"     {(= "5.0alpha"| ="5.0beta0")}
+  "ppx_tools_versioned"     {(= "5.0alpha"& ="5.0beta0")}
 ]
 
 available: [ ocaml-version >= "4.02.0" ]
diff --git a/js_of_ocaml.opam b/js_of_ocaml.opam
@@ -22,7 +22,7 @@ depends: [
 ]
 
 conflicts: [
-  "ppx_tools_versioned"     {(= "5.0alpha"| ="5.0beta0")}
+  "ppx_tools_versioned"     {(= "5.0alpha"& ="5.0beta0")}
 ]
 
 available: [ ocaml-version >= "4.02.0" ]