fix: solve confilct

nemo-shen · Jan 10, 2024 · 0e43f6a · 0e43f6a
1 parent 8d6cca0
commit 0e43f6a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/package.json b/package.json
@@ -27,13 +27,9 @@
   },
   "dependencies": {
     "@noi/core": "workspace:*",
-<<<<<<< Updated upstream
-    "vue": "^3.4.7"
-=======
+    "vue": "^3.4.7",
     "@vueuse/core": "^10.7.1",
-    "@vueuse/motion": "^2.0.0",
-    "vue": "^3.4.6"
->>>>>>> Stashed changes
+    "@vueuse/motion": "^2.0.0"
   },
   "devDependencies": {
     "@types/node": "^20.10.8",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml