From ecb0db44ce3d03885c1a75acf15d58b27f16a6ed Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 19 Nov 2012 01:16:54 +0100 Subject: Fix merge errors --- chimere/actions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chimere/actions.py') diff --git a/chimere/actions.py b/chimere/actions.py index a434279..8ef5338 100644 --- a/chimere/actions.py +++ b/chimere/actions.py @@ -34,7 +34,7 @@ class Action: def update_url(self, area_name): self.url = reverse(self.path, - args=[area_name+'/'] + self.extra_url_args) + args=[area_name + '/' if area_name else ''] + self.extra_url_args) default_actions = [(Action('view', 'chimere:index', _('View')), []), (Action('contribute', 'chimere:edit', _('Contribute')), -- cgit v1.2.3