From f561c14ccdbedaac9e217d249aa6620ab3b06c02 Mon Sep 17 00:00:00 2001 From: deyk Date: Wed, 18 Jan 2012 13:42:41 -0800 Subject: [PATCH 1/1] Specifying merge template for merge url. --- cas_provider/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cas_provider/urls.py b/cas_provider/urls.py index 75399c0..051ad1c 100644 --- 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'^merge/', login, {'merge': True, 'template': 'cas/merge.html'}) ) -- 2.20.1