[ckan-changes] [okfn/ckan] fac91e: Minor fix removing merge markers in internal plugi...

[GitHub]

  Branch: refs/heads/release-v1.6.1
  Home:   https://github.com/okfn/ckan
  Commit: fac91e5ee0de845050c0effd06a68bb0885ad1f8
      https://github.com/okfn/ckan/commit/fac91e5ee0de845050c0effd06a68bb0885ad1f8
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-13 (Tue, 13 Mar 2012)

  Changed paths:
    M ckanext/publisher_form/forms.py

  Log Message:
  -----------
  Minor fix removing merge markers in internal plugin