From a1f878b8456a8f6104805cf982b2234ed463f92a Mon Sep 17 00:00:00 2001
From: Mayra Cabrera <mcabrera@gitlab.com>
Date: Tue, 23 Jan 2018 10:44:18 -0600
Subject: Resolve conflict for secret management on Auto-DevOps

---
 vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'vendor')

diff --git a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
index ca5b0bf0764..7046932342b 100644
--- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
+++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
@@ -462,11 +462,8 @@ production:
   }
 
   function create_secret() {
-<<<<<<< HEAD
-=======
     echo "Create secret..."
 
->>>>>>> ea14c1e6963... Merge branch 'vendor-10-4-auto-devops-template' into 'master'
     kubectl create secret -n "$KUBE_NAMESPACE" \
       docker-registry gitlab-registry \
       --docker-server="$CI_REGISTRY" \
-- 
cgit v1.2.3