mirror of
https://github.com/status-im/consul.git
synced 2025-02-02 00:46:43 +00:00
Remove duplicate code
This commit is contained in:
parent
3e046d3efc
commit
85321301e1
@ -849,9 +849,6 @@ func MergeConfig(a, b *Config) *Config {
|
||||
if b.BindAddr != "" {
|
||||
result.BindAddr = b.BindAddr
|
||||
}
|
||||
if b.Ports.HTTP != 0 {
|
||||
result.Ports.HTTP = b.Ports.HTTP
|
||||
}
|
||||
if b.AdvertiseAddr != "" {
|
||||
result.AdvertiseAddr = b.AdvertiseAddr
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user