From 85321301e1add610f95c5b6f5d0827ef54be9a0f Mon Sep 17 00:00:00 2001 From: Andy Lo-A-Foe Date: Thu, 20 Aug 2015 20:46:20 +0200 Subject: [PATCH] Remove duplicate code --- command/agent/config.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/command/agent/config.go b/command/agent/config.go index 716b6e8e11..5b3357a34e 100644 --- a/command/agent/config.go +++ b/command/agent/config.go @@ -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 }