aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdelyn Breelove <[email protected]>2019-02-12 14:55:37 -0700
committerAdelyn Breelove <[email protected]>2019-02-12 14:55:37 -0700
commit24a0074e0dac6d7f1bde13dd0d7bac0690488a81 (patch)
treec50d571c83df6c67bc4a59f15baee3bcf054d9c3
parentUpdate types :) (diff)
parentupdate to yojson 1.6.0 and ppx_deriving_yojson to latest master (diff)
downloaddisml-24a0074e0dac6d7f1bde13dd0d7bac0690488a81.tar.xz
disml-24a0074e0dac6d7f1bde13dd0d7bac0690488a81.zip
merge resolve
-rw-r--r--disml.opam4
1 files changed, 2 insertions, 2 deletions
diff --git a/disml.opam b/disml.opam
index 37b2fd8..3ffd4fb 100644
--- a/disml.opam
+++ b/disml.opam
@@ -27,10 +27,10 @@ depends: [
"core" {>= "v0.11.3"}
"decompress" {>= "0.8"}
"odoc" {with-doc & >= "1.3.0"}
- "ppx_deriving_yojson" {>= "3.3"}
+ "ppx_deriving_yojson" {>= "3.1"}
"ppx_sexp_conv" {>= "v0.11.2"}
"websocket-async" {>= "2.12"}
- "yojson" {< "1.6.0"}
+ "yojson" {>= "1.6.0"}
]
build: [
["dune" "subst"] {pinned}