fix: resolved merge conflicts

reactplay · Feb 15, 2024 · bd630a4 · bd630a4
1 parent 044dcaa
commit bd630a4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git 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