Merge issue fixed

Florian Unglaub
1 parent 48443d20
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
app/controllers/omniauth_callbacks_controller.rb
@@ -33,7 +33,7 @@ class OmniauthCallbacksController &lt; 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
...	...	@@ -33,7 +33,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
33	33
34	34	if current_user
35	35	# Change a logged-in user's authentication method:
36		- current_user.uid = uid
	36	+ current_user.extern_uid = uid
37	37	current_user.provider = provider
38	38	current_user.save
39	39	redirect_to profile_path
...	...