style: Apply go fmt

This commit is contained in:
Vincent Ambo 2017-02-20 14:25:39 +01:00
parent 0b992c6156
commit 45aee8257f
3 changed files with 3 additions and 4 deletions

View file

@ -100,7 +100,7 @@ func TestSubresourceVariableInheritance(t *testing.T) {
"bar": "baz",
},
Include: nil,
Parent: "parent",
Parent: "parent",
},
},
BaseDir: "testdata",
@ -129,7 +129,7 @@ func TestSubresourceVariableInheritanceOverride(t *testing.T) {
"foo": "newvalue",
},
Include: nil,
Parent: "parent",
Parent: "parent",
},
},
BaseDir: "testdata",

View file

@ -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

View file

@ -1,8 +1,8 @@
package util
import (
"testing"
"reflect"
"testing"
)
func TestMergeWithEmptyMap(t *testing.T) {