github_mirrors/vue-vben-admin
1
0
Fork 0
mirror of https://github.com/vbenjs/vue-vben-admin.git synced 2025-08-27 04:21:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: Resolve merge conflicts

Browse Source
This commit is contained in:
vben
2024-07-31 21:26:54 +08:00
parent 4074a88c13
commit 082847c441
44 changed files with 772 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/effects/hooks/package.json
View File

@@ -24,7 +24,7 @@
"@vben/preferences": "workspace:*",
"@vben/stores": "workspace:*",
"@vben/types": "workspace:*",
"vue": "^3.4.34",
"vue": "^3.4.35",
"vue-router": "^4.4.0",
"watermark-js-plus": "^1.5.2"
}