From: melinath Date: Wed, 9 Jun 2010 21:57:18 +0000 (-0400) Subject: Merge branch 'blockcontainer' of github.com:melinath/philo into blockcontainer X-Git-Tag: philo-0.9~82^2~1^2^2~1 X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/3b0bf18d23d07d95c00a5e824d2f52cd98a1aae1 Merge branch 'blockcontainer' of github.com:melinath/philo into blockcontainer --- 3b0bf18d23d07d95c00a5e824d2f52cd98a1aae1 diff --cc templatetags/containers.py index ac43256,c04cb64..490b56b --- a/templatetags/containers.py +++ b/templatetags/containers.py @@@ -119,5 -119,4 +119,5 @@@ def do_container(parser, token) else: # error raise template.TemplateSyntaxError('"%s" template tag provided without arguments (at least one required)' % tag) -register.tag('container', do_container) +register.tag('container', do_container) - register.tag('blockcontainer', do_container) ++register.tag('blockcontainer', do_container)