remove merge conflict artifact

carvel-dev · Jun 17, 2022 · 1d376cc · 1d376cc
1 parent 98c9a36
commit 1d376cc
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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: