[ckan-changes] [ckan/ckan] 603c9c: [#3196] Fix bad merge conflict

[GitHub]

  Branch: refs/heads/3196-blueprints-and-templates
  Home:   https://github.com/ckan/ckan
  Commit: 603c9cf9ed725745d97cddf4b35008ef2e683695
      https://github.com/ckan/ckan/commit/603c9cf9ed725745d97cddf4b35008ef2e683695
  Author: amercader <amercadero at gmail.com>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M ckan/controllers/feed.py

  Log Message:
  -----------
  [#3196] Fix bad merge conflict