From 56906f29a10e627e1a0bf7f65b2d52fd1e59e5fb Mon Sep 17 00:00:00 2001
From: Ian Ward <ian@excess.org>
Date: Mon, 11 Sep 2017 16:17:01 -0400
Subject: [PATCH] fix merge errors

---
 ckan/lib/base.py            | 2 ++
 ckan/logic/action/update.py | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ckan/lib/base.py b/ckan/lib/base.py
index dede0a2b00e..7249034b84d 100644
--- 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
index f8d08bb90c1..5588df421e9 100644
--- 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__)