解决混乱代码

host.yaml

 develop_host:
   backend: http://backend.paas-develop.env
 #  doctor: http://doctor.paas-develop.env
-<<<<<<< HEAD
 #  backend: https://backend.igengmei.com
-=======
->>>>>>> cxx
+

in_common/base_request.py

@@ -100,10 +100,8 @@ class BaseRequest:
             # headers=user_headers,
             data=req.get('data'),
             json=req.get('json'),
-<<<<<<< HEAD
             # proxies={"http":"172.30.9.226:8888"}
-=======
->>>>>>> cxx
+
         )
         return r.json()
 

path_setting.py

@@ -103,7 +103,7 @@ MY_CONVERSATION = os.path.join(BASE_DIR, "backend_auto/test_backend_data/my_conv
 HOME_V5_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "service_request.yaml")
 HOME_V5=os.path.join(BASE_DIR,"backend_auto/test_backend_data/service_data","home_v5.yaml")
 
-<<<<<<< HEAD
+
 PERSONAL_CENTER_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "user_request.yaml")
 PERSONAL_CENTER = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_data", "personal_center.yaml")
 
@@ -166,10 +166,10 @@ COMMUNITY = os.path.join(BASE_DIR, "backend_auto/test_backend_data/feed_data", "
 #品类聚合页面标签和专场
 POLYMER_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "janus_request.yaml")
 POLYMER = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data", "polymer.yaml")
-=======
+
 THIRD_PHONE_LOGIN_CONFIG = os.path.join(BASE_DIR,"backend_auto/all_backend_api", "thirdphonelogin_request")
 THIRD_PHONE_LOGIN =os.path.join(BASE_DIR,"backend_auto/test_backend_data/account_data","login_thirdphone")
->>>>>>> cxx
+
 
 
 if __name__ == '__main__':