test(e2e): fix e2e err

test/e2e/krb5/pod-scope.yaml

@@ -1,20 +1,5 @@
 ---
 apiVersion: v1
-<<<<<<< Updated upstream
-kind: Service
-metadata:
-  name: krb5-pod-scope-service
-spec:
-  selector:
-    app: krb5-pod-scope
-  ports:
-  - port: 80
-    targetPort: http
-
----
-apiVersion: v1
-=======
->>>>>>> Stashed changes
 kind: Pod
 metadata:
   name: krb5-pod-scope

test/e2e/tls/chainsaw-test.yaml

@@ -1,38 +1,7 @@
 apiVersion: chainsaw.kyverno.io/v1alpha1
 kind: Test
 metadata:
-<<<<<<< Updated upstream
   name: tls
-spec:
-  steps:
-    - try:
-      - assert:
-          file: secretcsi-assert.yaml
-    - try:
-      - apply:
-          file: autotls.yaml
-      - assert:
-          file: autotls-assert.yaml
-      catch:
-      - sleep:
-          duration: 5s
-      - script:
-          env:
-            - name: NAMESPACE
-              value: ($namespace)
-          content: |
-            set -ex
-            kubectl -n $NAMESPACE get pods
-            kubectl -n 
-      - describe:
-          apiVersion: v1
-          kind: Pod
-          selector: name=auto-tls
-      - podLogs:
-          selector: name=auto-tls
-          tail: -1
-=======
-  name: autotls-pkcs12
 spec:
   steps:
     # tls smoke test case with pkcs12
@@ -74,4 +43,3 @@ spec:
           file: tls-scope.yaml
       - assert:
           file: tls-scope-assert.yaml
->>>>>>> Stashed changes