api: Fixing double region merge conflict

2017-09-04 13:20:51 -07:00 · 2017-09-04 13:20:51 -07:00 · 3f35b1ef0c
parent e74ea8a152
commit 3f35b1ef0c
1 changed files with 0 additions and 1 deletions
--- a/api/api.go
+++ b/api/api.go
@ -130,7 +130,6 @@ func (c *Config) ClientConfig(region, address string, tlsEnabled bool) *Config {
 		Address:    fmt.Sprintf("%s://%s", scheme, address),
 		Region:     region,
 		httpClient: defaultConfig.httpClient,
-		Region:     c.Region,
 		SecretID:   c.SecretID,
 		HttpAuth:   c.HttpAuth,
 		WaitTime:   c.WaitTime,