[ckan-changes] [ckan/ckan] 3c3e4c: Fix merge conflict

[GitHub]

  Branch: refs/heads/release-v2.5.8
  Home:   https://github.com/ckan/ckan
  Commit: 3c3e4cf4d6e98c16b129c8e24f767c5129d4429a
      https://github.com/ckan/ckan/commit/3c3e4cf4d6e98c16b129c8e24f767c5129d4429a
  Author: amercader <amercadero at gmail.com>
  Date:   2018-03-14 (Wed, 14 Mar 2018)

  Changed paths:
    M ckan/lib/search/query.py

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