chore: Resolve merge conflicts

2024-07-31 21:26:54 +08:00
parent 4074a88c13
commit 082847c441
44 changed files with 772 additions and 475 deletions
--- a/website/package.json
+++ b/website/package.json
@@ -4,7 +4,7 @@
  "private": true,
  "scripts": {
    "build": "vitepress build",
-    "docs:dev": "vitepress dev",
+    "dev": "vitepress dev",
    "docs:preview": "vitepress preview"
  },
  "dependencies": {
@@ -13,6 +13,6 @@
  "devDependencies": {
    "@vite-pwa/vitepress": "^0.5.0",
    "vitepress": "^1.3.1",
-    "vue": "^3.4.34"
+    "vue": "^3.4.35"
  }
 }