Specifying merge template for merge url.

diff --git a/cas_provider/urls.py b/cas_provider/urls.py
index 75399c0..051ad1c 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'^socialauth-login/$', socialauth_login),
                        url(r'^validate/', validate),
                        url(r'^logout/', logout),

-                       url(r'^merge/', login, {'merge': True})
+                       url(r'^merge/', login, {'merge': True, 'template': 'cas/merge.html'})

                        )
                        )