[ckan-changes] [ckan/ckan] 2c4d29: [#3196] Fix bad merge conflict

[GitHub]

  Branch: refs/heads/3196-common-context
  Home:   https://github.com/ckan/ckan
  Commit: 2c4d29126b75f411d13ee3ca976f305ec9e0f7a6
      https://github.com/ckan/ckan/commit/2c4d29126b75f411d13ee3ca976f305ec9e0f7a6
  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