Resolve app/views/repository_check_mailer/notify.text.haml

app/views/repository_check_mailer/notify.text.haml

@@ -3,7 +3,6 @@
 = _("View details: %{details_url}") % { details_url: admin_projects_url(last_repository_check_failed: 1) }
 
 = _("You are receiving this message because you are a GitLab administrator for %{url}.") % { url: Gitlab.config.gitlab.url }
-<<<<<<< HEAD
 
 -# EE-specific start
 - if Gitlab::CurrentSettings.email_additional_text.present?
@@ -11,5 +10,3 @@
   = '---'
   = Gitlab::Utils.nlbr(Gitlab::CurrentSettings.email_additional_text)
 -# EE-specific end
-=======
->>>>>>> upstream/master