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

ae850ab0 · George Tsiolis · 19a521ed · ae850ab0
Commit ae850ab0 authored Nov 21, 2018 by George Tsiolis
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/views/repository_check_mailer/notify.html.haml app/views/repository_check_mailer/notify.html.haml +0 -3

No files found.
--- a/app/views/repository_check_mailer/notify.html.haml
+++ b/app/views/repository_check_mailer/notify.html.haml
@@ -6,7 +6,6 @@

 %p
  = _("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?
@@ -16,5 +15,3 @@
    %br
      = Gitlab::Utils.nlbr(Gitlab::CurrentSettings.email_additional_text)
 -# EE-specific end
-=======
->>>>>>> upstream/master