Added missing comma.
authordeyk <deyk@crossway.org>
Mon, 16 Apr 2012 18:00:01 +0000 (11:00 -0700)
committerdeyk <deyk@crossway.org>
Mon, 16 Apr 2012 18:00:01 +0000 (11:00 -0700)
cas_provider/urls.py

index 154aac0..22f3dc7 100644 (file)
@@ -2,7 +2,7 @@ from django.conf.urls.defaults import patterns, url
 
 
 urlpatterns = patterns('cas_provider.views',
-    url(r'^login/merge/', 'login', {'merge': True, 'template_name': 'cas/merge.html'})
+    url(r'^login/merge/', 'login', {'merge': True, 'template_name': 'cas/merge.html'}),
     url(r'^login/?$', 'login', name='cas_login'),
     url(r'^socialauth-login/$', 'socialauth_login', name='cas_socialauth_login'),
     url(r'^validate/?$', 'validate', name='cas_validate'),