fix merge errors

ckan · Sep 11, 2017 · 56906f2 · 56906f2
1 parent 0fa4e10
commit 56906f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ckan/lib/base.py b/ckan/lib/base.py
@@ -95,6 +95,8 @@ def render(template_name, extra_vars=None, cache_key=None, cache_type=None,
 
        Document the parameters of :py:func:`ckan.plugins.toolkit.render`.
     '''
+    env = config['pylons.app_globals'].jinja_env
+    template = env.get_template(template_name)
 
     extras = extra_vars or {}
     extras.update(pylons_globals())

diff --git a/ckan/logic/action/update.py b/ckan/logic/action/update.py
@@ -27,7 +27,6 @@
 
 
 from ckan.common import _, request
-from ckan import new_authz
 
 log = logging.getLogger(__name__)