From bd630a4b5bb47a4f4d74e7a6098ac5f7a91ad83a Mon Sep 17 00:00:00 2001
From: clevercoderjoy <clevercoderjoy@gmail.com>
Date: Thu, 15 Feb 2024 10:42:18 +0530
Subject: [PATCH] fix: resolved merge conflicts

---
 package.json   |  3 ++-
 pnpm-lock.yaml | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a9eee421e9..8fb587506d 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,8 @@
     "workbox-precaching": "^7.0.0",
     "workbox-routing": "^7.0.0",
     "workbox-strategies": "^7.0.0",
-    "workbox-window": "^7.0.0"
+    "workbox-window": "^7.0.0",
+    "yarn": "^1.22.21"
   },
   "scripts": {
     "dev": "react-scripts start",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d4ded31ced..b195cda7b4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -239,6 +239,9 @@ dependencies:
   workbox-window:
     specifier: ^7.0.0
     version: 7.0.0
+  yarn:
+    specifier: ^1.22.21
+    version: 1.22.21
 
 devDependencies:
   '@babel/plugin-transform-private-property-in-object':
@@ -15520,6 +15523,13 @@ packages:
       y18n: 5.0.8
       yargs-parser: 21.1.1
 
+  /yarn@1.22.21:
+    resolution: {integrity: sha512-ynXaJsADJ9JiZ84zU25XkPGOvVMmZ5b7tmTSpKURYwgELdjucAOydqIOrOfTxVYcNXe91xvLZwcRh68SR3liCg==}
+    engines: {node: '>=4.0.0'}
+    hasBin: true
+    requiresBuild: true
+    dev: false
+
   /yauzl@2.10.0:
     resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}
     dependencies: