mirror of
https://github.com/vbenjs/vue-vben-admin.git
synced 2025-08-27 04:21:11 +08:00
chore: Resolve merge conflicts
This commit is contained in:
@@ -28,7 +28,7 @@
|
||||
"@vben/types": "workspace:*",
|
||||
"@vueuse/integrations": "^10.11.0",
|
||||
"qrcode": "^1.5.3",
|
||||
"vue": "^3.4.34",
|
||||
"vue": "^3.4.35",
|
||||
"vue-router": "^4.4.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
Reference in New Issue
Block a user