fix conclicts

elastic · Aug 20, 2024 · 967d2cf · 967d2cf
1 parent f02497a
commit 967d2cf
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/resources/fetching/fetchers/k8s/kube_fetcher_test.go b/resources/fetching/fetchers/k8s/kube_fetcher_test.go
@@ -24,11 +24,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/suite"
-<<<<<<< HEAD:resources/fetching/fetchers/k8s/kube_fetcher_test.go
 	v1 "k8s.io/api/core/v1"
-=======
-	"k8s.io/api/core/v1"
->>>>>>> 0029a1ad (Upgrade helm to v3.14.2 (#2356)):internal/resources/fetching/fetchers/k8s/kube_fetcher_test.go
 	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"

diff --git a/resources/fetching/fetchers/k8s/kube_provider.go b/resources/fetching/fetchers/k8s/kube_provider.go
@@ -118,11 +118,6 @@ func nullifyManagedFields(resource interface{}) {
 		val.ManagedFields = nil
 	case *kubernetes.ClusterRoleBinding:
 		val.ManagedFields = nil
-<<<<<<< HEAD:resources/fetching/fetchers/k8s/kube_provider.go
-	case *kubernetes.PodSecurityPolicy:
-		val.ManagedFields = nil
-=======
->>>>>>> 0029a1ad (Upgrade helm to v3.14.2 (#2356)):internal/resources/fetching/fetchers/k8s/kube_provider.go
 	case *kubernetes.ServiceAccount:
 		val.ManagedFields = nil
 	case *kubernetes.NetworkPolicy: