fix: 解决合并冲突

easymoneysniperrr · Oct 28, 2024 · 1581bf2 · 1581bf2
1 parent 79ffced
commit 1581bf2
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/vite.config.js b/vite.config.js
@@ -19,10 +19,6 @@ import { ElementPlusResolver } from 'unplugin-vue-components/resolvers'
 
 // https://vite.dev/config/
 export default defineConfig({
-<<<<<<< HEAD
-  // base: '/newportal/', // 匹配 Nginx 配置的路径前缀
-=======
->>>>>>> 0476a32256e4c369fa79f7aa052b2c7ab5fb0c93
   plugins: [
     vue(),
     AutoImport({