From 9a576baf8dad2b9cb552079574b8ecd103ca77e9 Mon Sep 17 00:00:00 2001
From: Alex Collins <alex_collins@intuit.com>
Date: Tue, 29 Oct 2019 19:18:02 -0700
Subject: [PATCH] changes on circleci to

---
 charts/argo-ci/values.yaml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/charts/argo-ci/values.yaml b/charts/argo-ci/values.yaml
index 848eb698..092b182e 100644
--- a/charts/argo-ci/values.yaml
+++ b/charts/argo-ci/values.yaml
@@ -9,8 +9,4 @@ argo:
   installMinio: true
   minioBucketName: argo-artifacts
   useReleaseAsInstanceID: true
-<<<<<<< HEAD
-  
-=======
-  
->>>>>>> changes on circleci to
+  
\ No newline at end of file