[ckan-changes] [okfn/ckan] 34f4d1: [xs, model] Fix merge error.

[noreply at github.com]

  Branch: refs/heads/release-v1.5.1c
  Home:   https://github.com/okfn/ckan

  Commit: 34f4d190e68d807be1ffa22a614d97cb1dd1bc59
      https://github.com/okfn/ckan/commit/34f4d190e68d807be1ffa22a614d97cb1dd1bc59
  Author: John Glover <john.c.glover at nuim.ie>
  Date:   2011-12-19 (Mon, 19 Dec 2011)

  Changed paths:
    M ckan/model/package.py

  Log Message:
  -----------
  [xs, model] Fix merge error.

This should have been in commit d80654e8c836b5ea78a03cb164ef71c2397e85f6