Skip to content

C
config_repository
Commit c7055743 authored by 黎博's avatar 黎博
Browse files
Options

merge

parent 631c929d
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 5 deletions
yaml/replace_config_tke.yaml
View file @ c7055743
...@@ -130,7 +130,6 @@ bnDefaultRule: &bnDefaultRule ...@@ -130,7 +130,6 @@ bnDefaultRule: &bnDefaultRule
reg: '/sa\?project=production' reg: '/sa\?project=production'
to: '/sa?project=default' to: '/sa?project=default'
<<<<<<< HEAD
# 测试平台域名替换规则 # 测试平台域名替换规则
testPlatformRule: &testPlatformRule testPlatformRule: &testPlatformRule
<<: *rule <<: *rule
...@@ -138,7 +137,6 @@ testPlatformRule: &testPlatformRule ...@@ -138,7 +137,6 @@ testPlatformRule: &testPlatformRule
to: *lkbDomain to: *lkbDomain
useNamespace: true useNamespace: true
=======
# 替换qg-rc # 替换qg-rc
qgrcRule: &qgrcRule qgrcRule: &qgrcRule
...@@ -160,9 +158,6 @@ qg91Rule: &qg91Rule ...@@ -160,9 +158,6 @@ qg91Rule: &qg91Rule
useNamespace: false useNamespace: false
>>>>>>> 2ec66a6406d6d7c26f1f9a91e38f48686c406ed3
common: &common common: &common
h5AuthRule: *h5AuthRule h5AuthRule: *h5AuthRule
qgApiRule: *qgApiRule qgApiRule: *qgApiRule
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment