From 45aee8257fd5bb947cb127cd645d8ab571a15379 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@gmail.com>
Date: Mon, 20 Feb 2017 14:25:39 +0100
Subject: [PATCH] style: Apply go fmt

---
 context/context_test.go | 4 ++--
 util/util.go            | 1 -
 util/util_test.go       | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/context/context_test.go b/context/context_test.go
index 66b857ffe..4c95f058c 100644
--- a/context/context_test.go
+++ b/context/context_test.go
@@ -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",
diff --git a/util/util.go b/util/util.go
index 3d05322ef..ea9f636ac 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 c08055335..a6adcd713 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) {