diff options
| author | prathamesh | 2016-07-09 00:20:08 +0530 |
|---|---|---|
| committer | prathamesh | 2016-07-09 00:20:08 +0530 |
| commit | 2ebda0b9b6b30b5b5c381742f94edf06aedc02eb (patch) | |
| tree | 8548a7b766b5b760511e05c848df6b774ea9e647 | |
| parent | 7b61ac1c1c8c43b07afe90682f809013be857777 (diff) | |
| download | online_test-2ebda0b9b6b30b5b5c381742f94edf06aedc02eb.tar.gz online_test-2ebda0b9b6b30b5b5c381742f94edf06aedc02eb.tar.bz2 online_test-2ebda0b9b6b30b5b5c381742f94edf06aedc02eb.zip | |
conflict resolved
| -rw-r--r-- | online_test/settings.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/online_test/settings.py b/online_test/settings.py index 7ad7b8c..e53164e 100644 --- a/online_test/settings.py +++ b/online_test/settings.py @@ -92,8 +92,6 @@ LOGIN_REDIRECT_URL = '/exam/' SOCIAL_AUTH_LOGIN_ERROR_URL = '/exam/login/' -LOGIN_REDIRECT_URL = '/exam' - EMAIL_USE_TLS = False EMAIL_HOST = 'your_email_host' |