From c8733065644741bb5ebe54043b7b800c9d0f3458 Mon Sep 17 00:00:00 2001
From: Yuvraj <yuvraj.yad001@gmail.com>
Date: Fri, 27 Mar 2020 14:39:35 +0530
Subject: [PATCH] Fixed error
Signed-off-by: Yuvraj <yuvraj.yad001@gmail.com>
---
pkg/engine/mutate/overlayCondition_test.go | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/pkg/engine/mutate/overlayCondition_test.go b/pkg/engine/mutate/overlayCondition_test.go
index 1c8fc2c89e..984af52940 100644
--- a/pkg/engine/mutate/overlayCondition_test.go
+++ b/pkg/engine/mutate/overlayCondition_test.go
@@ -714,25 +714,13 @@ func TestMeetConditions_AtleastOneExist(t *testing.T) {
var resource, overlay interface{}
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 010bc2b43d99e27daf8709baca5b02ac5ca10011
err := json.Unmarshal(resourceRaw, &resource)
assert.NilError(t, err)
err = json.Unmarshal(overlayRaw, &overlay)
assert.NilError(t, err)
- path, err := meetConditions(resource, overlay)
-<<<<<<< HEAD
-=======
- json.Unmarshal(resourceRaw, &resource)
- json.Unmarshal(overlayRaw, &overlay)
path, err := meetConditions(log.Log, resource, overlay)
->>>>>>> 589f8ece47f95aedc4ee0decee8d29cb77b73dd6
-=======
->>>>>>> 010bc2b43d99e27daf8709baca5b02ac5ca10011
assert.Assert(t, reflect.DeepEqual(err, overlayError{}))
assert.Assert(t, len(path) == 0)
}