Resolve conflicts from custom additional email text

Conflicts from (CE) https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18183
to (EE) https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5031

doc/administration/index.md

@@ -101,10 +101,7 @@ created in snippets, wikis, and repos.
   - [Postfix for incoming email](reply_by_email_postfix_setup.md): Set up a
   basic Postfix mail server with IMAP authentication on Ubuntu for incoming
   emails.
-<<<<<<< HEAD
 - **(Premium)** [Additional custom email text](../user/admin_area/settings/email.md): Set a custom message that appears at the bottom of the every email.
-=======
->>>>>>> upstream/master
 - [User Cohorts](../user/admin_area/user_cohorts.md): Display the monthly cohorts of new users and their activities over time.
 
 [reply by email]: reply_by_email.md

doc/user/admin_area/settings/email.md

@@ -3,7 +3,6 @@
 ## Custom logo
 
 The logo in the header of some emails can be customized, see the [logo customization section](../../../customization/branded_page_and_email_header.md).
-<<<<<<< HEAD
 
 ## Custom additional text
 
@@ -20,5 +19,3 @@ legal/auditing/compliance reasons.
 
 [ee-5031]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5031
 [eep]: https://about.gitlab.com/pricing/
-=======
->>>>>>> upstream/master

spec/mailers/previews/notify_preview.rb

@@ -123,7 +123,6 @@ class NotifyPreview < ActionMailer::Preview
     Notify.pipeline_failed_email(pipeline, pipeline.user.try(:email))
   end
 
-<<<<<<< HEAD
   # EE-specific start
   def add_merge_request_approver_email
     Notify.add_merge_request_approver_email(user.id, merge_request.id, user.id).message
@@ -170,8 +169,6 @@ class NotifyPreview < ActionMailer::Preview
   end
   # EE-specific end
 
-=======
->>>>>>> upstream/master
   private
 
   def project
@@ -216,13 +213,10 @@ class NotifyPreview < ActionMailer::Preview
 
     email
   end
-<<<<<<< HEAD
 
   # EE-specific start
   def approver
     @user ||= User.first
   end
   # EE-specific end
-=======
->>>>>>> upstream/master
 end