From 5f482ed37bc4095e94429becae943a48ea8487ee Mon Sep 17 00:00:00 2001
From: Tejal Desai <tejaldesai@google.com>
Date: Wed, 29 Jan 2020 11:48:29 -0800
Subject: [PATCH] fix web editor conflicts resolutions

---
 integration/integration_test.go | 8 ++++----
 pkg/config/options.go           | 4 +---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/integration/integration_test.go b/integration/integration_test.go
index 41f92748ca..9a02b445c9 100644
--- a/integration/integration_test.go
+++ b/integration/integration_test.go
@@ -216,7 +216,7 @@ func getGitRepo() string {
 	}
 	return "github.com/GoogleContainerTools/kaniko"
 }
-  
+
 func TestGitBuildcontext(t *testing.T) {
 	repo := getGitRepo()
 	dockerfile := "integration/dockerfiles/Dockerfile_test_run_2"
@@ -283,12 +283,12 @@ func TestBuildViaRegistryMirror(t *testing.T) {
 	kanikoCmd := exec.Command("docker",
 		append([]string{"run",
 			"-v", os.Getenv("HOME") + "/.config/gcloud:/root/.config/gcloud",
-                	ExecutorImage,
+			ExecutorImage,
 			"-f", dockerfile,
 			"-d", kanikoImage,
 			"--registry-mirror", "gcr.io",
-                        contextFlag, contextPath
-			"-b", config.gcsBucket)...)
+			contextFlag, contextPath,
+			"-b", config.gcsBucket})...)
 
 	out, err = RunCommandWithoutTest(kanikoCmd)
 	if err != nil {
diff --git a/pkg/config/options.go b/pkg/config/options.go
index 12a77aecad..92ab868e5e 100644
--- a/pkg/config/options.go
+++ b/pkg/config/options.go
@@ -40,12 +40,10 @@ type KanikoOptions struct {
 	ImageNameDigestFile     string
 	OCILayoutPath           string
 	RegistryMirror          string
-  InsecureRegistries      multiArg
+	InsecureRegistries      multiArg
 	SkipTLSVerifyRegistries multiArg
 	Destinations            multiArg
 	BuildArgs               multiArg
-	InsecureRegistries      multiArg
-	SkipTLSVerifyRegistries multiArg
 	Insecure                bool
 	SkipTLSVerify           bool
 	InsecurePull            bool