From e567a81f9dd15c15981c25576cc83df6331ea2b5 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 20 五月 2025 11:19:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
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