From 36ffdf36b96a877154f265327d83d022ed27e9e4 Mon Sep 17 00:00:00 2001
From: Florian Unglaub <florian.unglaub@nix-wie-weg.de>
Date: Fri, 24 Aug 2012 15:40:44 +0200
Subject: [PATCH] Merge issue fixed

---
 app/controllers/omniauth_callbacks_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index 9b40e5640d0..00ec7c42603 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -33,7 +33,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
 
     if current_user
       # Change a logged-in user's authentication method:
-      current_user.uid = uid
+      current_user.extern_uid = uid
       current_user.provider = provider
       current_user.save
       redirect_to profile_path