From e7137534a037b7be176b3c176f52525cc0df5f45 Mon Sep 17 00:00:00 2001
From: Alex Collins <alex_collins@intuit.com>
Date: Tue, 29 Oct 2019 19:17:07 -0700
Subject: [PATCH] changes on HEAD to
 charts/argo-ci/values.yaml,charts/argo-ci/values.yaml,

---
 charts/argo-ci/values.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/charts/argo-ci/values.yaml b/charts/argo-ci/values.yaml
index 151ea1f7..848eb698 100644
--- a/charts/argo-ci/values.yaml
+++ b/charts/argo-ci/values.yaml
@@ -9,4 +9,8 @@ argo:
   installMinio: true
   minioBucketName: argo-artifacts
   useReleaseAsInstanceID: true
+<<<<<<< HEAD
   
+=======
+  
+>>>>>>> changes on circleci to