diff --git a/public/public.js b/public/public.js
index 7af867c..d2e324b 100644
--- a/public/public.js
+++ b/public/public.js
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 //内网测试环境
 // let web_url="http://20.56.230.91:10080"
 // let request_url="http://20.56.230.91:10080/bnscloud"
@@ -8,12 +7,7 @@ let web_url="http://127.0.0.1:8849"
 let request_url="http://127.0.0.1:18080/bnscloud"
 
 
-=======
-let web_url="http://localhost:18080"
 
-let contentPath="/bonus_cloud_web";
-let request_url="http://localhost:18080/bnscloud"
->>>>>>> 2910273ea71f09a59dc973dfe61a6811de865c71
 //承载力大屏
 let czl_url= request_url+"/czldp";
 //承载力后台