Resolve conflicts in spec/models/members/project_member_spec.rb

app/models/members/project_member.rb

@@ -13,11 +13,8 @@ class ProjectMember < Member
 
   scope :in_project, ->(project) { where(source_id: project.id) }
 
-<<<<<<< HEAD
   before_destroy :delete_member_branch_protection
 
-=======
->>>>>>> upstream/master
   class << self
     # Add users to projects with passed access option
     #
@@ -96,7 +93,6 @@ class ProjectMember < Member
 
   private
 
-<<<<<<< HEAD
   def delete_member_branch_protection
     if user.present? && project.present?
       project.protected_branches.merge_access_by_user(user).destroy_all
@@ -104,8 +100,6 @@ class ProjectMember < Member
     end
   end
 
-=======
->>>>>>> upstream/master
   def send_invite
     notification_service.invite_project_member(self, @raw_invite_token) unless @skip_notification