Remove duplicate code

This commit is contained in:
Andy Lo-A-Foe 2015-08-20 20:46:20 +02:00
parent 3e046d3efc
commit 85321301e1

View File

@ -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
}