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

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

Showing with 0 additions and 5 deletions

app/services/members/create_service.rb app/services/members/create_service.rb +0 -5

No files found.
--- a/app/services/members/create_service.rb
+++ b/app/services/members/create_service.rb
 module Members
  class CreateService < Members::BaseService
-<<<<<<< HEAD
    prepend EE::Members::CreateService
    DEFAULT_LIMIT = 100
-=======
-    DEFAULT_LIMIT = 100
->>>>>>> upstream/master
    def execute(source)
      return error('No users specified.') if params[:user_ids].blank?