From 3ee8c68c6b6aae54a9c81025c4d828feccb26dc3 Mon Sep 17 00:00:00 2001
From: Raphael Tiersch <r.tiersch@jobware.de>
Date: Tue, 4 Sep 2018 22:34:09 +0200
Subject: [PATCH] Fixed automated merge - one conflict

---
 cobra/cmd/testdata/root.go.golden | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cobra/cmd/testdata/root.go.golden b/cobra/cmd/testdata/root.go.golden
index 9584ebe7..d1af9385 100644
--- a/cobra/cmd/testdata/root.go.golden
+++ b/cobra/cmd/testdata/root.go.golden
@@ -58,7 +58,8 @@ func Execute() {
 	}
 }
 
-func init() {Environ = environ.New(VendorName, ApplicationName)
+func init() {
+	Environ = environ.New(VendorName, ApplicationName)
 	cobra.OnInitialize(initConfig)
 
 	// Here you will define your flags and configuration settings.