Commit 0d32dcfb authored by James Lopez's avatar James Lopez

fix conflict on create_service

parent 009f2e75
module Applications
class CreateService
<<<<<<< HEAD
prepend ::EE::Applications::CreateService
def initialize(current_user, params)
@current_user = current_user
@params = params
=======
def initialize(current_user, params)
@current_user = current_user
@params = params
@ip_address = @params.delete(:ip_address)
>>>>>>> ce-com/master
end
def execute(request = nil)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment