From 00c59797b8229d2fac37c5589d34a2be9a35ca93 Mon Sep 17 00:00:00 2001
From: Milos Milutinovic <milos.milutinovic@kortechs.io>
Date: Tue, 6 Oct 2020 12:30:07 +0200
Subject: [PATCH] ..

---
 .digital-ocean-deploy.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.digital-ocean-deploy.yml b/.digital-ocean-deploy.yml
index 7466192..bf5620c 100644
--- a/.digital-ocean-deploy.yml
+++ b/.digital-ocean-deploy.yml
@@ -1,11 +1,8 @@
 .deploy_digital_ocean:
   image: bitnami/kubectl:1.18.8
   script:
-<<<<<<< HEAD
     - echo $KUBERNETES_SERVER
     - echo $KUBERNETES_TOKEN
-=======
->>>>>>> 6dabdf8fbe97da4d338ed58667aeadb8e71f30fc
     - cd k8s/$APP/overlays/$OVERLAY/
     - kustomize --insecure-skip-tls-verify --kubeconfig="/dev/null" --server=$KUBERNETES_SERVER --token=$KUBERNETES_TOKEN edit set image $CI_REGISTRY_IMAGE=$NEW_IMAGE
     - kustomize build . | kubectl --insecure-skip-tls-verify --kubeconfig="/dev/null" --server=$KUBERNETES_SERVER --token=$KUBERNETES_TOKEN  apply -f -
-- 
GitLab