Merge pull request #468 from Leonidas-from-XIV/result-conflict

Conflict with old version of `result`
tarides · Apr 25, 2023 · 939b905 · 939b905
2 parents 6e16324 + 35a00df
commit 939b905
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/dune-project b/dune-project
@@ -40,4 +40,6 @@ with [Dune](https://github.com/ocaml/dune) and hosted on
   logs
   odoc
   (alcotest :with-test)
-  (yojson (>= 1.6))))
+  (yojson (>= 1.6)))
+ (conflicts
+   (result (< 1.5))))
diff --git a/dune-release.opam b/dune-release.opam
@@ -37,6 +37,9 @@ depends: [
   "alcotest" {with-test}
   "yojson" {>= "1.6"}
 ]
+conflicts: [
+  "result" {< "1.5"}
+]
 build: [
   ["dune" "subst"] {dev}
   [