[ckan-changes] [okfn/ckan] c4a61a: [2255] Fix typo in merge conflict resolution

[GitHub]

  Branch: refs/heads/feature-2255-organizations
  Home:   https://github.com/okfn/ckan
  Commit: c4a61a7623519f5e16731b5dc0995b8c16c6df07
      https://github.com/okfn/ckan/commit/c4a61a7623519f5e16731b5dc0995b8c16c6df07
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py

  Log Message:
  -----------
  [2255] Fix typo in merge conflict resolution