Permalink
Browse files

Fixed missed merge conflict

  • Loading branch information...
1 parent de9cdcc commit 16cadb1d0ad58de659023201e15e3187b589833c @apmon committed Sep 9, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 app/controllers/user_controller.rb
@@ -208,7 +208,7 @@ def new
@title = t 'user.new.title'
@referer = params[:referer] || session[:referer]
- if using_open_id?
+ if using_federated_login?
# The redirect from the OpenID provider reenters here
# again and we need to pass the parameters through to
# the open_id_authentication function

0 comments on commit 16cadb1

Please sign in to comment.