changes on HEAD to charts/argo-ci/values.yaml,charts/argo-ci/values.yaml,

This commit is contained in:
Alex Collins 2019-10-29 19:17:07 -07:00
parent 9d6dfc4e36
commit e7137534a0

View file

@ -9,4 +9,8 @@ argo:
installMinio: true
minioBucketName: argo-artifacts
useReleaseAsInstanceID: true
<<<<<<< HEAD
=======
>>>>>>> changes on circleci to