From: deyk <deyk@crossway.org>
Date: Wed, 18 Jan 2012 21:42:41 +0000 (-0800)
Subject: Specifying merge template for merge url.
X-Git-Tag: 22.4~57
X-Git-Url: https://git.mdrn.pl/django-cas-provider.git/commitdiff_plain/f561c14ccdbedaac9e217d249aa6620ab3b06c02?ds=sidebyside;hp=36da57ccf1745c118c112fe457a173293e74ad36

Specifying merge template for merge url.
---

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'})
                        )