[ckan-changes] [ckan/ckan] acbfce: Fix merge errors

[GitHub]

  Branch: refs/heads/2.6
  Home:   https://github.com/ckan/ckan
  Commit: acbfceb493687d40679ac39dd618d89736743bba
      https://github.com/ckan/ckan/commit/acbfceb493687d40679ac39dd618d89736743bba
  Author: amercader <amercadero at gmail.com>
  Date:   2018-05-08 (Tue, 08 May 2018)

  Changed paths:
    A doc/_substitutions.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst

  Log Message:
  -----------
  Fix merge errors


  Commit: 9b2a27aec8b42c76d17230f2a3332f56fa683baa
      https://github.com/ckan/ckan/commit/9b2a27aec8b42c76d17230f2a3332f56fa683baa
  Author: amercader <amercadero at gmail.com>
  Date:   2018-05-08 (Tue, 08 May 2018)

  Changed paths:
    A doc/_substitutions.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst

  Log Message:
  -----------
  Merge branch 'dev-v2.6' into 2.6


Compare: https://github.com/ckan/ckan/compare/5e2090dc7eeb...9b2a27aec8b4
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.