From 2ebda0b9b6b30b5b5c381742f94edf06aedc02eb Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Sat, 9 Jul 2016 00:20:08 +0530
Subject: conflict resolved

---
 online_test/settings.py | 2 --
 1 file changed, 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'
-- 
cgit