From 603c9cf9ed725745d97cddf4b35008ef2e683695 Mon Sep 17 00:00:00 2001 From: amercader Date: Thu, 15 Sep 2016 15:00:49 +0100 Subject: [PATCH] [#3196] Fix bad merge conflict --- ckan/controllers/feed.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ckan/controllers/feed.py b/ckan/controllers/feed.py index 2732d4aa492..4e86bbb873a 100644 --- a/ckan/controllers/feed.py +++ b/ckan/controllers/feed.py @@ -351,7 +351,7 @@ def custom(self): feed_title=u'%s - Custom query' % site_title, feed_description=u'Recently created or updated' ' datasets on %s. Custom query: \'%s\'' % - (g.site_title, q), + (site_title, q), feed_link=alternate_url, feed_guid=_create_atom_id(atom_url), feed_url=feed_url,