From 425f0514a65e36a5365ebc1d20c019e97e08df28 Mon Sep 17 00:00:00 2001
From: Armon Dadgar <armon.dadgar@gmail.com>
Date: Mon, 4 Sep 2017 13:20:51 -0700
Subject: [PATCH] api: Fixing double region merge conflict

---
 api/api.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/api/api.go b/api/api.go
index e5f47db78..3d83de8e9 100644
--- 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,