fix: resolve merge conflict

safe-global · Dec 12, 2024 · 5e3b12c · 5e3b12c
1 parent 9c25040
commit 5e3b12c
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/yarn.lock b/yarn.lock
@@ -5871,19 +5871,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@safe-global/protocol-kit@npm:^4.1.2":
-  version: 4.1.2
-  resolution: "@safe-global/protocol-kit@npm:4.1.2"
+"@safe-global/protocol-kit@npm:^4.1.3":
+  version: 4.1.3
+  resolution: "@safe-global/protocol-kit@npm:4.1.3"
   dependencies:
     "@noble/hashes": "npm:^1.3.3"
     "@safe-global/safe-core-sdk-types": "npm:^5.1.0"
-    "@safe-global/safe-deployments": "npm:^1.37.21"
+    "@safe-global/safe-deployments": "npm:^1.37.22"
     "@safe-global/safe-modules-deployments": "npm:^2.2.1"
     abitype: "npm:^1.0.2"
     ethereumjs-util: "npm:^7.1.5"
     ethers: "npm:^6.13.1"
     semver: "npm:^7.6.2"
-  checksum: 10/8a575af31599b8b0f71fd34baa6067b58ac91033a96ac6af2fe2525021b9df08a09f9eb73a07673a59fd7a9de86ef41cf631112e496f2001f909c26a09eda1f2
+  checksum: 10/c6d45ad2814b6cfc9a0689d119deaaf093debd4a2bd896a34fa79d370fa11a3509f6ce49327f1c91b754f1e7a0974eb6caf972b796040476b85384732ee13710
   languageName: node
   linkType: hard
 
@@ -5924,12 +5924,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@safe-global/safe-deployments@npm:^1.37.21":
-  version: 1.37.21
-  resolution: "@safe-global/safe-deployments@npm:1.37.21"
+"@safe-global/safe-deployments@npm:^1.37.22":
+  version: 1.37.22
+  resolution: "@safe-global/safe-deployments@npm:1.37.22"
   dependencies:
     semver: "npm:^7.6.2"
-  checksum: 10/5eefd7f0f72df8ac95308e3272d198136fdbd598cdda06aa18fe700b679eeb99d88d75d6b449e69812085947f942292578ac63de9e545542ab17779a2a625fac
+  checksum: 10/722553e71ed8bfc0a228ea0157badc6dde71ca31a2950ba77676464e281e0f5c220bf6e8e6865ffd3c67ee9520c192aafadb5f835f7d80c43e75418651d12d35
   languageName: node
   linkType: hard
 
@@ -22688,7 +22688,7 @@ __metadata:
     "@reduxjs/toolkit": "npm:^2.2.6"
     "@reown/walletkit": "npm:^1.1.1"
     "@safe-global/api-kit": "npm:^2.4.6"
-    "@safe-global/protocol-kit": "npm:^4.1.2"
+    "@safe-global/protocol-kit": "npm:^4.1.3"
     "@safe-global/safe-apps-sdk": "npm:^9.1.0"
     "@safe-global/safe-client-gateway-sdk": "npm:v1.60.1"
     "@safe-global/safe-core-sdk-types": "npm:^5.0.1"