fix: solve merge conflict
Showing
- .github/workflows/github-actions.yml 1 addition, 0 deletions.github/workflows/github-actions.yml
- .travis.yml 1 addition, 0 deletions.travis.yml
- README.md 8 additions, 0 deletionsREADME.md
- README_CN.md 8 additions, 0 deletionsREADME_CN.md
- cluster/router/chain/chain.go 12 additions, 4 deletionscluster/router/chain/chain.go
- common/extension/config_post_processor.go 45 additions, 0 deletionscommon/extension/config_post_processor.go
- common/proxy/proxy.go 6 additions, 2 deletionscommon/proxy/proxy.go
- common/proxy/proxy_factory/default.go 1 addition, 1 deletioncommon/proxy/proxy_factory/default.go
- common/rpc_service.go 17 additions, 11 deletionscommon/rpc_service.go
- common/rpc_service_test.go 14 additions, 14 deletionscommon/rpc_service_test.go
- common/url.go 55 additions, 17 deletionscommon/url.go
- common/url_test.go 61 additions, 0 deletionscommon/url_test.go
- config/application_config.go 1 addition, 4 deletionsconfig/application_config.go
- config/base_config.go 0 additions, 4 deletionsconfig/base_config.go
- config/config_center_config.go 2 additions, 5 deletionsconfig/config_center_config.go
- config/config_loader_test.go 3 additions, 3 deletionsconfig/config_loader_test.go
- config/consumer_config.go 1 addition, 4 deletionsconfig/consumer_config.go
- config/interfaces/config_post_processor.go 32 additions, 0 deletionsconfig/interfaces/config_post_processor.go
- config/method_config.go 1 addition, 4 deletionsconfig/method_config.go
- config/provider_config.go 1 addition, 4 deletionsconfig/provider_config.go
Please register or sign in to comment