[ckan-changes] [ckan/ckan] 3330fb: Fix merge conflict

[GitHub]

  Branch: refs/heads/3229-api-blueprint
  Home:   https://github.com/ckan/ckan
  Commit: 3330fb9d62603919cd6bfe9066f3439c7d4d3bd3
      https://github.com/ckan/ckan/commit/3330fb9d62603919cd6bfe9066f3439c7d4d3bd3
  Author: amercader <amercadero at gmail.com>
  Date:   2017-01-25 (Wed, 25 Jan 2017)

  Changed paths:
    M ckan/config/middleware/flask_app.py

  Log Message:
  -----------
  Fix merge conflict