Merge pull request #12327 from kit-ty-kate/ocamlformat-dune

ocamlformat.0.{3,4}: Add conflict with dune
ocaml · Jul 11, 2018 · 79d0bbd · 79d0bbd
2 parents f01a841 + 2c8b8c2
commit 79d0bbd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/packages/ocamlformat/ocamlformat.0.3/opam b/packages/ocamlformat/ocamlformat.0.3/opam
@@ -18,4 +18,7 @@ depends: [
   "ocamlformat_support" {= "0.2"}
   "stdio"
 ]
+conflicts: [
+  "dune"
+]
 available: [ ocaml-version >= "4.04.1" ]
diff --git a/packages/ocamlformat/ocamlformat.0.4/opam b/packages/ocamlformat/ocamlformat.0.4/opam
@@ -18,4 +18,7 @@ depends: [
   "ocamlformat_support" {= "0.3"}
   "stdio"
 ]
+conflicts: [
+  "dune"
+]
 available: [ocaml-version >= "4.04.1"]