Simplified getting the service off the session for social login.

[django-cas-provider.git] / cas_provider / urls.py

diff --git a/cas_provider/urls.py b/cas_provider/urls.py
index 75399c0..f91786b 100644 (file)
--- a/cas_provider/urls.py
+++ b/cas_provider/urls.py
@@ -7,5 +7,5 @@ urlpatterns = patterns('',
                        url(r'^socialauth-login/$', socialauth_login),
                        url(r'^validate/', validate),
                        url(r'^logout/', logout),
-                       url(r'^merge/', login, {'merge': True})
+                       url(r'^login/merge/', login, {'merge': True, 'template_name': 'cas/merge.html'})
                        )