From 4039d71a4ec1055a518ae13ac03b18b87e7f0126 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 10 Nov 2023 12:07:51 -0500
Subject: [PATCH] merged conflicts

---
 unlock-app/package.json |  2 +-
 yarn.lock               | 27 +++++++++++++++++++--------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/unlock-app/package.json b/unlock-app/package.json
index 86dbd36cf83..4edce7a8427 100644
--- a/unlock-app/package.json
+++ b/unlock-app/package.json
@@ -29,7 +29,7 @@
     "@walletconnect/ethereum-provider": "2.9.2",
     "@walletconnect/modal": "2.6.2",
     "@xstate/react": "3.2.2",
-    "axios": "1.4.0",
+    "axios": "1.6.0",
     "blockies-react-svg": "0.0.13",
     "calendar-link": "2.5.1",
     "csv": "6.3.5",
diff --git a/yarn.lock b/yarn.lock
index 83401440392..c1a8811f870 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -19592,7 +19592,7 @@ __metadata:
     "@walletconnect/modal": 2.6.2
     "@xstate/react": 3.2.2
     autoprefixer: 10.4.16
-    axios: 1.4.0
+    axios: 1.6.0
     blockies-react-svg: 0.0.13
     calendar-link: 2.5.1
     csv: 6.3.5
@@ -22470,14 +22470,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:1.4.0, axios@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "axios@npm:1.4.0"
+"axios@npm:1.6.0":
+  version: 1.6.0
+  resolution: "axios@npm:1.6.0"
   dependencies:
-    follow-redirects: ^1.15.0
-    form-data: ^4.0.0
-    proxy-from-env: ^1.1.0
-  checksum: 7fb6a4313bae7f45e89d62c70a800913c303df653f19eafec88e56cea2e3821066b8409bc68be1930ecca80e861c52aa787659df0ffec6ad4d451c7816b9386b
+    follow-redirects: "npm:^1.15.0"
+    form-data: "npm:^4.0.0"
+    proxy-from-env: "npm:^1.1.0"
+  checksum: c7c9f2ae9e0b9bad7d6f9a4dff030930b12ee667dedf54c3c776714f91681feb743c509ac0796ae5c01e12c4ab4a2bee74905068dd200fbc1ab86f9814578fb0
   languageName: node
   linkType: hard
 
@@ -22518,6 +22518,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"axios@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "axios@npm:1.4.0"
+  dependencies:
+    follow-redirects: "npm:^1.15.0"
+    form-data: "npm:^4.0.0"
+    proxy-from-env: "npm:^1.1.0"
+  checksum: b987e4259e5cfc93e95ee306c267a44380bbc045789a91b716e8434a75e22987344605eb4e133482fe285dd3a2e0b7e791ba26999965f04a5ecdde25f56930cb
+  languageName: node
+  linkType: hard
+
 "axios@npm:^1.5.1":
   version: 1.5.1
   resolution: "axios@npm:1.5.1"