merge

yaml/replace_config_tke.yaml

@@ -130,7 +130,6 @@ bnDefaultRule: &bnDefaultRule
   reg: '/sa\?project=production' 
   to: '/sa?project=default'
 
-<<<<<<< HEAD
 # 测试平台域名替换规则
 testPlatformRule: &testPlatformRule
   <<: *rule
@@ -138,7 +137,6 @@ testPlatformRule: &testPlatformRule
   to: *lkbDomain
   useNamespace: true
 
-=======
 
 # 替换qg-rc
 qgrcRule: &qgrcRule
@@ -160,9 +158,6 @@ qg91Rule: &qg91Rule
   useNamespace: false  
 
 
-
-
->>>>>>> 2ec66a6406d6d7c26f1f9a91e38f48686c406ed3
 common: &common
   h5AuthRule: *h5AuthRule
   qgApiRule: *qgApiRule