[ckan-changes] [okfn/ckan] cbf224: Fixing up tests after merge conflicts

[GitHub]

  Branch: refs/heads/feature-1485-package-and-group-custom-forms
  Home:   https://github.com/okfn/ckan
  Commit: cbf2243a5a631024710f586130a4cac9bede0c17
      https://github.com/okfn/ckan/commit/cbf2243a5a631024710f586130a4cac9bede0c17
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-01-20 (Fri, 20 Jan 2012)

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

  Log Message:
  -----------
  Fixing up tests after merge conflicts