setter

2021-09-03 18:38:04 +08:00 · 2021-09-03 18:38:04 +08:00 · 308655bed5
parent 35e359caef
commit 308655bed5
1 changed files with 1 additions and 4 deletions
--- 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