[#3196] Fix bad merge conflict

ckan · Sep 15, 2016 · 1f421fd · 1f421fd
1 parent c6d3bbc
commit 1f421fd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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,