Resolve conflict in app/services/members/approve_access_request_service.rb

b76dfe8b · Stan Hu · bb516340 · b76dfe8b
Commit b76dfe8b authored Feb 27, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

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

-=======
->>>>>>> upstream/master
    def execute(access_requester, skip_authorization: false, skip_log_audit_event: false)
      raise Gitlab::Access::AccessDeniedError unless skip_authorization || can_update_access_requester?(access_requester)