Skip to content

Commit

Permalink
Fix wrong resolves of conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
dks17 committed Apr 27, 2018
1 parent 61c582b commit 8f46f25
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions app/controllers/devise_token_auth/registrations_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,6 @@ def create
@client_id, @token = @resource.create_token
@resource.save!
update_auth_header
else
# user will require email authentication
@resource.send_confirmation_instructions(
client_config: params[:config_name],
redirect_url: @redirect_url
)
end
render_create_success
else
Expand Down

0 comments on commit 8f46f25

Please sign in to comment.