fixup! Add lower bound on yojson 2.0

inhabitedtype · Oct 30, 2023 · 9075af7 · 9075af7
1 parent a3a7568
commit 9075af7
Show file tree

Hide file tree

Showing 15 changed files with 0 additions and 60 deletions.
diff --git a/aws-autoscaling.opam b/aws-autoscaling.opam
@@ -23,11 +23,7 @@ depends: [
   "cohttp-lwt" {with-test & >= "2.4.0"}
   "cohttp-lwt-unix" {with-test & >= "2.4.0"}
   "lwt" {with-test & >= "4.0.0"}
-<<<<<<< HEAD
-  "yojson" {with-test & >= "1.7.0"}
-=======
   "yojson" {with-test & >= "2.0"}
->>>>>>> 15b920809 (Add lower bound on yojson 2.0)
 ]
 build: [
   ["dune" "subst"] {pinned}

diff --git a/aws-cloudformation.opam b/aws-cloudformation.opam
@@ -23,11 +23,7 @@ depends: [
   "cohttp-lwt" {with-test & >= "2.4.0"}
   "cohttp-lwt-unix" {with-test & >= "2.4.0"}
   "lwt" {with-test & >= "4.0.0"}
-<<<<<<< HEAD
-  "yojson" {with-test & >= "1.7.0"}
-=======
   "yojson" {with-test & >= "2.0"}
->>>>>>> 15b920809 (Add lower bound on yojson 2.0)
 ]
 build: [
   ["dune" "subst"] {pinned}

diff --git a/aws-cloudtrail.opam b/aws-cloudtrail.opam
@@ -23,11 +23,7 @@ depends: [
   "cohttp-lwt" {with-test & >= "2.4.0"}
   "cohttp-lwt-unix" {with-test & >= "2.4.0"}
   "lwt" {with-test & >= "4.0.0"}
-<<<<<<< HEAD
-  "yojson" {with-test & >= "1.7.0"}
-=======
   "yojson" {with-test & >= "2.0"}
->>>>>>> 15b920809 (Add lower bound on yojson 2.0)
 ]
 build: [
   ["dune" "subst"] {pinned}

diff --git a/aws-cloudwatch.opam b/aws-cloudwatch.opam
@@ -23,11 +23,7 @@ depends: [
   "cohttp-lwt" {with-test & >= "2.4.0"}
   "cohttp-lwt-unix" {with-test & >= "2.4.0"}
   "lwt" {with-test & >= "4.0.0"}
-<<<<<<< HEAD
-  "yojson" {with-test & >= "1.7.0"}
-=======
   "yojson" {with-test & >= "2.0"}
->>>>>>> 15b920809 (Add lower bound on yojson 2.0)
 ]
 build: [
   ["dune" "subst"] {pinned}

diff --git a/aws-ec2.opam b/aws-ec2.opam
@@ -23,11 +23,7 @@ depends: [
   "cohttp-lwt" {with-test & >= "2.4.0"}
   "cohttp-lwt-unix" {with-test & >= "2.4.0"}
   "lwt" {with-test & >= "4.0.0"}
-<<<<<<< HEAD
-  "yojson" {with-test & >= "1.7.0"}
-=======
   "yojson" {with-test & >= "2.0"}
->>>>>>> 15b920809 (Add lower bound on yojson 2.0)
 ]
 build: [
   ["dune" "subst"] {pinned}

diff --git a/aws-elasticache.opam b/aws-elasticache.opam
@@ -23,11 +23,7 @@ depends: [
   "cohttp-lwt" {with-test & >= "2.4.0"}
   "cohttp-lwt-unix" {with-test & >= "2.4.0"}
   "lwt" {with-test & >= "4.0.0"}
-<<<<<<< HEAD
-  "yojson" {with-test & >= "1.7.0"}
-=======
   "yojson" {with-test & >= "2.0"}
->>>>>>> 15b920809 (Add lower bound on yojson 2.0)
 ]
 build: [
   ["dune" "subst"] {pinned}

diff --git a/aws-elasticloadbalancing.opam b/aws-elasticloadbalancing.opam
@@ -23,11 +23,7 @@ depends: [
   "cohttp-lwt" {with-test & >= "2.4.0"}
   "cohttp-lwt-unix" {with-test & >= "2.4.0"}
   "lwt" {with-test & >= "4.0.0"}
-<<<<<<< HEAD
-  "yojson" {with-test & >= "1.7.0"}
-=======
   "yojson" {with-test & >= "2.0"}
->>>>>>> 15b920809 (Add lower bound on yojson 2.0)
 ]
 build: [
   ["dune" "subst"] {pinned}

diff --git a/aws-gen.opam b/aws-gen.opam
@@ -19,10 +19,6 @@ depends: [
   "base-unix"
   "cmdliner" {>= "1.1.0"}
   "fmt"
-<<<<<<< HEAD
-  "yojson" {>= "1.6.0"}
-=======
->>>>>>> 15b920809 (Add lower bound on yojson 2.0)
   "ocaml-compiler-libs" {>= "0.11.0" }
   "ocamlgraph"
   "dune" {>= "2.7"}

diff --git a/aws-kms.opam b/aws-kms.opam
@@ -23,11 +23,7 @@ depends: [
   "cohttp-lwt" {with-test & >= "2.4.0"}
   "cohttp-lwt-unix" {with-test & >= "2.4.0"}
   "lwt" {with-test & >= "4.0.0"}
-<<<<<<< HEAD
-  "yojson" {with-test & >= "1.7.0"}
-=======
   "yojson" {with-test & "2.0"}
->>>>>>> 15b920809 (Add lower bound on yojson 2.0)
 ]
 build: [
   ["dune" "subst"] {pinned}

diff --git a/aws-rds.opam b/aws-rds.opam
@@ -23,11 +23,7 @@ depends: [
   "cohttp-lwt" {with-test & >= "2.4.0"}
   "cohttp-lwt-unix" {with-test & >= "2.4.0"}
   "lwt" {with-test & >= "4.0.0"}
-<<<<<<< HEAD
-  "yojson" {with-test & >= "1.7.0"}
-=======
   "yojson" {with-test & >= "2.0"}
->>>>>>> 15b920809 (Add lower bound on yojson 2.0)
 ]
 build: [
   ["dune" "subst"] {pinned}

diff --git a/aws-route53.opam b/aws-route53.opam
@@ -23,11 +23,7 @@ depends: [
   "cohttp-lwt" {with-test & >= "2.4.0"}
   "cohttp-lwt-unix" {with-test & >= "2.4.0"}
   "lwt" {with-test & >= "4.0.0"}
-<<<<<<< HEAD
-  "yojson" {with-test & >= "1.7.0"}
-=======
   "yojson" {with-test & "2.0"}
->>>>>>> 15b920809 (Add lower bound on yojson 2.0)
 ]
 build: [
   ["dune" "subst"] {pinned}

diff --git a/aws-sdb.opam b/aws-sdb.opam
@@ -23,11 +23,7 @@ depends: [
   "cohttp-lwt" {with-test & >= "2.4.0"}
   "cohttp-lwt-unix" {with-test & >= "2.4.0"}
   "lwt" {with-test & >= "4.0.0"}
-<<<<<<< HEAD
-  "yojson" {with-test & >= "1.7.0"}
-=======
   "yojson" {with-test & >= "2.0"}
->>>>>>> 15b920809 (Add lower bound on yojson 2.0)
 ]
 build: [
   ["dune" "subst"] {pinned}

diff --git a/aws-sqs.opam b/aws-sqs.opam
@@ -23,11 +23,7 @@ depends: [
   "cohttp-lwt" {with-test & >= "2.4.0"}
   "cohttp-lwt-unix" {with-test & >= "2.4.0"}
   "lwt" {with-test & >= "4.0.0"}
-<<<<<<< HEAD
-  "yojson" {with-test & >= "1.7.0"}
-=======
   "yojson" {with-test & >= "2.0"}
->>>>>>> 15b920809 (Add lower bound on yojson 2.0)
 ]
 build: [
   ["dune" "subst"] {pinned}

diff --git a/aws-ssm.opam b/aws-ssm.opam
@@ -23,11 +23,7 @@ depends: [
   "cohttp-lwt" {with-test & >= "2.4.0"}
   "cohttp-lwt-unix" {with-test & >= "2.4.0"}
   "lwt" {with-test & >= "4.0.0"}
-<<<<<<< HEAD
-  "yojson" {with-test & >= "1.7.0"}
-=======
   "yojson" {with-test & >= "2.0"}
->>>>>>> 15b920809 (Add lower bound on yojson 2.0)
 ]
 build: [
   ["dune" "subst"] {pinned}

diff --git a/aws-sts.opam b/aws-sts.opam
@@ -23,11 +23,7 @@ depends: [
   "cohttp-lwt" {with-test & >= "2.4.0"}
   "cohttp-lwt-unix" {with-test & >= "2.4.0"}
   "lwt" {with-test & >= "4.0.0"}
-<<<<<<< HEAD
-  "yojson" {with-test & >= "1.7.0"}
-=======
   "yojson" {with-test & >= "2.0"}
->>>>>>> 15b920809 (Add lower bound on yojson 2.0)
 ]
 build: [
   ["dune" "subst"] {pinned}