[ckan-changes] [okfn/ckan] f1e155: Fix merge conflicts in configuration.rst doc

[GitHub]

  Branch: refs/heads/release-v2.0
  Home:   https://github.com/okfn/ckan
  Commit: f1e1553d5fb67bcdbc25da8c1ae8c028b5178930
      https://github.com/okfn/ckan/commit/f1e1553d5fb67bcdbc25da8c1ae8c028b5178930
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-30 (Tue, 30 Apr 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  Fix merge conflicts in configuration.rst doc