status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-02-08 11:54:12 +00:00
Code Issues Projects Releases Wiki Activity

Remove duplicate code

Browse Source
This commit is contained in:
Andy Lo-A-Foe 2015-08-20 20:46:20 +02:00
parent 3e046d3efc
commit 85321301e1
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
command/agent/config.go
View File

@ -849,9 +849,6 @@ func MergeConfig(a, b *Config) *Config {
if b.BindAddr != "" { if b.BindAddr != "" {
result.BindAddr = b.BindAddr result.BindAddr = b.BindAddr
} }
if b.Ports.HTTP != 0 {
result.Ports.HTTP = b.Ports.HTTP
}
if b.AdvertiseAddr != "" { if b.AdvertiseAddr != "" {
result.AdvertiseAddr = b.AdvertiseAddr result.AdvertiseAddr = b.AdvertiseAddr
} }