Resolve conflicts

app/models/members/group_member.rb

@@ -42,32 +42,20 @@ class GroupMember < Member
   private
 
   def send_invite
-<<<<<<< HEAD
     run_after_commit_or_now { notification_service.invite_group_member(self, @raw_invite_token) } unless @skip_notification
-=======
-    run_after_commit_or_now { notification_service.invite_group_member(self, @raw_invite_token) }
->>>>>>> upstream/master
 
     super
   end
 
   def post_create_hook
-<<<<<<< HEAD
     run_after_commit_or_now { notification_service.new_group_member(self) } unless @skip_notification
-=======
-    run_after_commit_or_now { notification_service.new_group_member(self) }
->>>>>>> upstream/master
 
     super
   end
 
   def post_update_hook
     if access_level_changed?
-<<<<<<< HEAD
       run_after_commit { notification_service.update_group_member(self) } unless @skip_notification
-=======
-      run_after_commit { notification_service.update_group_member(self) }
->>>>>>> upstream/master
     end
 
     super

app/models/members/project_member.rb

@@ -101,11 +101,7 @@ class ProjectMember < Member
   end
 
   def send_invite
-<<<<<<< HEAD
     run_after_commit_or_now { notification_service.invite_project_member(self, @raw_invite_token) } unless @skip_notification
-=======
-    run_after_commit_or_now { notification_service.invite_project_member(self, @raw_invite_token) }
->>>>>>> upstream/master
 
     super
   end
@@ -113,11 +109,7 @@ class ProjectMember < Member
   def post_create_hook
     unless owner?
       event_service.join_project(self.project, self.user)
-<<<<<<< HEAD
       run_after_commit_or_now { notification_service.new_project_member(self) } unless @skip_notification
-=======
-      run_after_commit_or_now { notification_service.new_project_member(self) }
->>>>>>> upstream/master
     end
 
     super
@@ -125,11 +117,7 @@ class ProjectMember < Member
 
   def post_update_hook
     if access_level_changed?
-<<<<<<< HEAD
       run_after_commit { notification_service.update_project_member(self) } unless @skip_notification
-=======
-      run_after_commit { notification_service.update_project_member(self) }
->>>>>>> upstream/master
     end
 
     super

app/services/notification_service.rb

@@ -14,11 +14,8 @@
 #   NotificationService.new.async.new_issue(issue, current_user)
 #
 class NotificationService
-<<<<<<< HEAD
   prepend EE::NotificationService
 
-=======
->>>>>>> upstream/master
   class Async
     attr_reader :parent
     delegate :respond_to_missing, to: :parent
@@ -526,7 +523,6 @@ class NotificationService
     end
   end
 
-<<<<<<< HEAD
   def add_mr_approvers_email(merge_request, approvers, current_user)
     approvers.each do |approver|
       recipient = approver.user
@@ -539,8 +535,6 @@ class NotificationService
     Notify
   end
 
-=======
->>>>>>> upstream/master
   private
 
   def recipients_for_pages_domain(domain)

config/initializers/omniauth.rb

@@ -26,10 +26,7 @@ end
 module OmniAuth
   module Strategies
     autoload :Bitbucket, Rails.root.join('lib', 'omni_auth', 'strategies', 'bitbucket')
-<<<<<<< HEAD
     autoload :GroupSaml, Rails.root.join('ee', 'lib', 'omni_auth', 'strategies', 'group_saml')
-=======
->>>>>>> upstream/master
     autoload :Jwt, Rails.root.join('lib', 'omni_auth', 'strategies', 'jwt')
   end
 end