diff --git a/vue.config.js b/vue.config.js
index 9126c49..4e48566 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -8,6 +8,10 @@
  */
 const { defineConfig } = require('@vue/cli-service')
 module.exports = defineConfig({
+<<<<<<< HEAD
   publicPath: process.env.VITE_BASE,
+=======
+  ppublicPath: process.env.VITE_BASE,
+>>>>>>> 3a3701f5d9f534c1d1d845c8bb92acd13581de53
   transpileDependencies: true
 })