fix conflicts

This commit is contained in:
RockYang
2024-03-12 18:07:19 +08:00
74 changed files with 249 additions and 1630 deletions

View File

@@ -4,7 +4,7 @@
"description": "",
"main": "index.js",
"scripts": {
"clear": "rimraf node_modules projects/vue-admin/node_modules projects/vue-mobile/node_modules projects/vue-web/node_modules",
"clear": "rimraf node_modules projects/vue-admin/node_modules",
"dev": "pnpm --filter=@gpt-vue-projects/* run dev",
"build": "pnpm --filter=@gpt-vue-projects/* run build"
},