diff options
| -rw-r--r-- | vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml | 3 |
1 files changed, 0 insertions, 3 deletions
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" \ |