about summary refs log tree commit diff
path: root/util
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@gmail.com>2017-02-20T13·25+0100
committerVincent Ambo <tazjin@gmail.com>2017-02-20T13·25+0100
commit45aee8257fd5bb947cb127cd645d8ab571a15379 (patch)
treefcd9a87f3b9e40420eb0d648fb161898cee4a37b /util
parent0b992c6156a3beba093ff41030783a68f52377ef (diff)
style: Apply go fmt
Diffstat (limited to 'util')
-rw-r--r--util/util.go1
-rw-r--r--util/util_test.go2
2 files changed, 1 insertions, 2 deletions
diff --git a/util/util.go b/util/util.go
index 3d05322efb..ea9f636ac8 100644
--- a/util/util.go
+++ b/util/util.go
@@ -11,7 +11,6 @@ func Merge(in1 *map[string]interface{}, in2 *map[string]interface{}) *map[string
 		return in1
 	}
 
-
 	new := make(map[string]interface{})
 	for k, v := range *in1 {
 		new[k] = v
diff --git a/util/util_test.go b/util/util_test.go
index c080553357..a6adcd713f 100644
--- a/util/util_test.go
+++ b/util/util_test.go
@@ -1,8 +1,8 @@
 package util
 
 import (
-	"testing"
 	"reflect"
+	"testing"
 )
 
 func TestMergeWithEmptyMap(t *testing.T) {