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/packages/types/package.json
+++ b/packages/types/package.json
@@ -21,7 +21,7 @@
  },
  "dependencies": {
    "@vben-core/typings": "workspace:*",
-    "vue": "^3.4.34",
+    "vue": "^3.4.35",
    "vue-router": "^4.4.0"
  }
 }