[ckan-changes] [ckan/ckan] 6e456b: Fix bad merge

[Adrià Mercader]

  Branch: refs/heads/py3-general-support
  Home:   https://github.com/ckan/ckan
  Commit: 6e456b264e95867740fb97452eb6348c9ff8be39
      https://github.com/ckan/ckan/commit/6e456b264e95867740fb97452eb6348c9ff8be39
  Author: amercader <amercadero at gmail.com>
  Date:   2019-12-04 (Wed, 04 Dec 2019)

  Changed paths:
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  Fix bad merge