From f822eedae9b85adbbbe4f2b8f27e5b8320c12938 Mon Sep 17 00:00:00 2001 From: Daniel Greenfeld Date: Fri, 31 May 2013 17:41:20 +0200 Subject: [PATCH] merge --- djadmin2/actions.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/djadmin2/actions.py b/djadmin2/actions.py index f595d70..e1ced5a 100644 --- a/djadmin2/actions.py +++ b/djadmin2/actions.py @@ -3,7 +3,8 @@ from django.core.exceptions import PermissionDenied from django.template.response import TemplateResponse from django.utils.encoding import force_text from django.utils.text import capfirst -from django.utils.translation import ugettext_lazy, ugettext as _ +from django.utils.translation import ugettext_lazy +from django.utils.translation import ugettext as _ from . import utils