diff -r 27253368f045 -r 93325a5d61f0 web/ldtplatform/settings.py
--- a/web/ldtplatform/settings.py	Mon Apr 18 18:34:49 2011 +0200
+++ b/web/ldtplatform/settings.py	Wed Apr 20 00:55:58 2011 +0200
@@ -1,6 +1,5 @@
 #@PydevCodeAnalysisIgnore
 import os.path
-from social_auth_settings import *
 # Django settings for project.
 
 DEBUG = True
@@ -168,8 +167,13 @@
 OAUTH_CALLBACK_VIEW = 'oauth_provider.views.fake_callback_view'
 TEST_WEBSERVER_ADDRPORT = "127.0.0.1:8888"
 
+FACEBOOK_APP_ID = '163134140411313'
+FACEBOOK_API_SECRET = 'f25e0754a44f0d90d3f4d9ea961ff012'
+
+SOCIAL_AUTH_COMPLETE_URL_NAME  = 'complete'
+SOCIAL_AUTH_ASSOCIATE_URL_NAME = 'associate_complete'
+
 from config import *
-#from socialauthsettings import *
 
 LOGIN_URL = BASE_URL + 'accounts/login/'
 LOGOUT_URL = BASE_URL + 'accounts/disconnect/'
@@ -180,12 +184,7 @@
 
 LOGIN_ERROR_URL = BASE_URL + 'accounts/login'
 
-FACEBOOK_APP_ID = '163134140411313'
-FACEBOOK_API_SECRET = 'f25e0754a44f0d90d3f4d9ea961ff012'
-
-SOCIAL_AUTH_COMPLETE_URL_NAME  = 'complete'
-SOCIAL_AUTH_ASSOCIATE_URL_NAME = 'associate_complete'
-
 GLOBAL_LOG_LEVEL = LOG_LEVEL
 GLOBAL_LOG_HANDLERS = [{'handler':logging.FileHandler(LOG_FILE), 'format':"%(asctime)s - %(levelname)s : %(message)s"}]
 
+