From b57160198e2700758cac0b5af8f4372b7ac3dac3 Mon Sep 17 00:00:00 2001
From: Tejal Desai <tejaldesai@google.com>
Date: Fri, 4 Oct 2019 11:20:41 -0700
Subject: [PATCH] fix bad merge

---
 pkg/executor/push_test.go | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/pkg/executor/push_test.go b/pkg/executor/push_test.go
index 578f3c588..f771e400e 100644
--- a/pkg/executor/push_test.go
+++ b/pkg/executor/push_test.go
@@ -17,14 +17,20 @@ limitations under the License.
 package executor
 
 import (
-
+	"bytes"
 	"fmt"
+	"io/ioutil"
+	"net/http"
 	"os"
 	"path/filepath"
 	"testing"
 
+	"github.com/GoogleContainerTools/kaniko/pkg/config"
+	"github.com/GoogleContainerTools/kaniko/testutil"
 	"github.com/google/go-containerregistry/pkg/name"
+	"github.com/google/go-containerregistry/pkg/v1/layout"
 	"github.com/google/go-containerregistry/pkg/v1/random"
+	"github.com/google/go-containerregistry/pkg/v1/validate"
 	"github.com/spf13/afero"
 )
 
@@ -95,19 +101,7 @@ func TestWriteImageOutputs(t *testing.T) {
 			}
 		})
 	}
-=======
-	"bytes"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"testing"
-
-	"github.com/GoogleContainerTools/kaniko/pkg/config"
-	"github.com/GoogleContainerTools/kaniko/testutil"
-	"github.com/google/go-containerregistry/pkg/v1/layout"
-	"github.com/google/go-containerregistry/pkg/v1/random"
-	"github.com/google/go-containerregistry/pkg/v1/validate"
-)
+}
 
 func TestHeaderAdded(t *testing.T) {
 	tests := []struct {