Resolve app/services/notification_recipient_service.rb

4f0a69a0 · Robert Speicher · 68f4b26e · 4f0a69a0
Commit 4f0a69a0 authored Aug 14, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/services/notification_recipient_service.rb app/services/notification_recipient_service.rb +0 -3

No files found.
--- a/app/services/notification_recipient_service.rb
+++ b/app/services/notification_recipient_service.rb
@@ -220,11 +220,8 @@ module NotificationRecipientService
    end

    class Default < Base
-<<<<<<< HEAD
      prepend ::EE::NotificationRecipientBuilders::Default

-=======
->>>>>>> upstream/master
      MENTION_TYPE_ACTIONS = [:new_issue, :new_merge_request].freeze

      attr_reader :target