From 308655bed591fbf1f91bb6c35022e771822e8f38 Mon Sep 17 00:00:00 2001
From: wangxinglong <2371974647@qq.com>
Date: Fri, 3 Sep 2021 18:38:04 +0800
Subject: [PATCH] setter

---
 config.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/config.js b/config.js
index 71afff5..72114f4 100644
--- a/config.js
+++ b/config.js
@@ -2,11 +2,8 @@ var host = "https://carbonneutral.bjfs.org.cn";//线上
 // var host = "https://carbon.my-footprint.cn";//线上域名2
 
 // var host = "https://tanzhonghe-admin.com";//本地
-<<<<<<< HEAD
 // var host = "https://carbon.scdxtc.cn";//大向天诚服务器
-=======
-// var host = "http://carbon.scdxtc.cn";//大向天诚服务器
->>>>>>> 7aeb254a85a161e4f3eef68e01a6674b00a20fb1
+
 var config = {
 	host: host,
 	appkey: '8c10f27733333fef726885b08ff9d858',//appkey 碳中和Y