Resovle conflict in app/services/members/update_service.rb

7548c9aa · Stan Hu · 1964d522 · 7548c9aa
Commit 7548c9aa authored Feb 27, 2018 by Stan Hu
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/services/members/update_service.rb app/services/members/update_service.rb +0 -3

No files found.
--- a/app/services/members/update_service.rb
+++ b/app/services/members/update_service.rb
 module Members
  class UpdateService < Members::BaseService
-<<<<<<< HEAD
    prepend EE::Members::UpdateService

-=======
->>>>>>> upstream/master
    # returns the updated member
    def execute(member, permission: :update)
      raise Gitlab::Access::AccessDeniedError unless can?(current_user, action_member_permission(permission, member), member)