From 1d376ccc7312c0f8b7ccf98dd298b5bb1fa58ff4 Mon Sep 17 00:00:00 2001
From: Joe Kimmel <jkimmel@vmware.com>
Date: Fri, 17 Jun 2022 13:56:41 -0700
Subject: [PATCH] remove merge conflict artifact

---
 test/e2e/assets/https-server/server.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/e2e/assets/https-server/server.yml b/test/e2e/assets/https-server/server.yml
index 3335508c3..081445302 100644
--- a/test/e2e/assets/https-server/server.yml
+++ b/test/e2e/assets/https-server/server.yml
@@ -100,7 +100,6 @@ data:
     apiVersion: v1
     kind: Service
     metadata:
-<<<<<<< HEAD
       namespace: default
       name: simple-app
     spec: