Resolve merge_requests.rb

65bbf38e · Luke Bennett · 211e848a · 65bbf38e
Commit 65bbf38e authored Jan 19, 2018 by Luke Bennett
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/mailers/emails/merge_requests.rb app/mailers/emails/merge_requests.rb +0 -3

No files found.
--- a/app/mailers/emails/merge_requests.rb
+++ b/app/mailers/emails/merge_requests.rb
@@ -47,7 +47,6 @@ module Emails
      mail_answer_thread(@merge_request, merge_request_thread_options(updated_by_user_id, recipient_id, reason))
    end
-<<<<<<< HEAD
    def add_merge_request_approver_email(recipient_id, merge_request_id, updated_by_user_id, reason = nil)
      setup_merge_request_mail(merge_request_id, recipient_id)
@@ -69,8 +68,6 @@ module Emails
      mail_answer_thread(@merge_request, merge_request_thread_options(unapproved_by_user_id, recipient_id, reason))
    end
-=======
->>>>>>> upstream/master
    def resolved_all_discussions_email(recipient_id, merge_request_id, resolved_by_user_id, reason = nil)
      setup_merge_request_mail(merge_request_id, recipient_id)