From fe3fd82f31b4fb43f6b207715a443e96d0442b26 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 02 四月 2024 16:38:52 +0800
Subject: [PATCH] 提交一把

---
 platform/vue.config.js |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/platform/vue.config.js b/platform/vue.config.js
index 49cee89..c8c48d1 100644
--- a/platform/vue.config.js
+++ b/platform/vue.config.js
@@ -3,11 +3,7 @@
 // const outputDir = process.env.VUE_APP_CONTEXT_PATH.substring(1, process.env.VUE_APP_CONTEXT_PATH.length)
 module.exports = {
   publicPath: './',
-<<<<<<< HEAD
   outputDir: 'yyb_web',
-=======
-  outputDir: 'dest',
->>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
   assetsDir: 'static',
   lintOnSave: false,
   devServer: {

--
Gitblit v1.9.3