mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/student-h5.git
synced 2025-12-09 02:46:47 +08:00
feat:合并
This commit is contained in:
@@ -8,6 +8,10 @@
|
|||||||
*/
|
*/
|
||||||
const { defineConfig } = require('@vue/cli-service')
|
const { defineConfig } = require('@vue/cli-service')
|
||||||
module.exports = defineConfig({
|
module.exports = defineConfig({
|
||||||
|
<<<<<<< HEAD
|
||||||
publicPath: process.env.VITE_BASE,
|
publicPath: process.env.VITE_BASE,
|
||||||
|
=======
|
||||||
|
ppublicPath: process.env.VITE_BASE,
|
||||||
|
>>>>>>> 3a3701f5d9f534c1d1d845c8bb92acd13581de53
|
||||||
transpileDependencies: true
|
transpileDependencies: true
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user