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