Resolve lib/gitlab/email/handler.rb

e3cbf0ba · Sean McGivern · cde1181d · e3cbf0ba
Commit e3cbf0ba authored Sep 03, 2018 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

lib/gitlab/email/handler.rb lib/gitlab/email/handler.rb +0 -3

No files found.
--- a/lib/gitlab/email/handler.rb
+++ b/lib/gitlab/email/handler.rb
@@ -3,11 +3,8 @@
 module Gitlab
  module Email
    module Handler
-<<<<<<< HEAD
      prepend ::EE::Gitlab::Email::Handler
-=======
->>>>>>> upstream/master
      def self.handlers
        @handlers ||= load_handlers
      end