Merge pull request ocaml#11454 from jpdeplaix/fix_ppx_deriving_yojson

Fix build failure with ppx_deriving_yojson.3.1 & ppx_deriving.4.2
pveber · Feb 21, 2018 · 32baab7 · 32baab7
2 parents e03e1d5 + 2599808
commit 32baab7
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.1/opam b/packages/ppx_deriving_yojson/ppx_deriving_yojson.3.1/opam
@@ -27,3 +27,6 @@ depends: [
   "ounit"        {test}
   "ppx_import"   {test & >= "1.1"}
 ]
+conflicts: [
+  "ppx_deriving" {= "4.2"}
+]