fix conflict

1d265e05 · Mitsuhiro Tanda · fe3d3bc3 · 1d265e05
Commit 1d265e05 authored Sep 13, 2017 by Mitsuhiro Tanda
Show whitespace changes
Inline Side-by-side

Showing with 1 additions and 3 deletions

pkg/tsdb/cloudwatch/metric_find_query.go
+1 -3

No files found.
--- a/pkg/tsdb/cloudwatch/metric_find_query.go
+++ b/pkg/tsdb/cloudwatch/metric_find_query.go
@@ -249,9 +249,7 @@ func (e *CloudWatchExecutor) handleGetNamespaces(ctx context.Context, parameters

 	customNamespaces := e.DataSource.JsonData.Get("customMetricsNamespaces").MustString()
 	if customNamespaces != "" {
-		for _, key := range strings.Split(customNamespaces, ",") {
-			keys = append(keys, key)
-		}
+		keys = append(keys, strings.Split(customNamespaces, ",")...)
 	}

 	sort.Sort(sort.StringSlice(keys))