From fb6d7af7c924e6c1e23251fce4c79aaadb5664a2 Mon Sep 17 00:00:00 2001
From: doublekou <951513186@qq.com>
Date: Fri, 24 Nov 2023 11:59:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A2=84=E6=B5=8B=E5=BC=8F?=
 =?UTF-8?q?=E5=A4=96=E5=91=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.env.development b/.env.development
index 02f887d..450ad4f 100644
--- a/.env.development
+++ b/.env.development
@@ -18,8 +18,4 @@ VUE_APP_BASE_IMG  = 'http://39.100.77.21:8013'
 VUE_APP_WS_API = 'wss://baiyee.vip'
 
 # 是否启用 babel-plugin-dynamic-import-node插件
-<<<<<<< HEAD
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
-=======
-VUE_CLI_BABEL_TRANSPILE_MODULES = true
->>>>>>> 4025a156f728ac573dc4bae6b4f1f08f2072752c