From 8f21175035a952e51944980a78cc81007091b73b Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Fri, 8 Jun 2018 09:40:31 -0500
Subject: [PATCH] Resolve
 app/views/projects/settings/ci_cd/_autodevops_form.html.haml

---
 app/views/projects/settings/ci_cd/_autodevops_form.html.haml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
index b50c7b23561..b8635f5de95 100644
--- a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
+++ b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
@@ -39,15 +39,12 @@
                     = s_('%{nip_domain} can be used as an alternative to a custom domain.').html_safe % { nip_domain: "<code>#{cluster_ingress_ip}.nip.io</code>".html_safe }
                   = link_to icon('question-circle'), help_page_path('topics/autodevops/index.md', anchor: 'auto-devops-base-domain'), target: '_blank'
 
-<<<<<<< HEAD
                 -# EE-specific start
                 .form-text.text-muted
                   = s_('CICD|Do not set up a domain here if you are setting up multiple Kubernetes clusters with Auto DevOps.')
                   = link_to icon('question-circle'), help_page_path('topics/autodevops/index.md', anchor: 'using-multiple-kubernetes-clusters'), target: '_blank'
                 -# EE-specific end
 
-=======
->>>>>>> upstream/master
                 %label.prepend-top-10
                   %strong= s_('CICD|Deployment strategy')
                 %p.settings-message.text-center
-- 
2.30.9