[ckan-changes] [okfn/ckan] 0be6d0: [xs] Removed missed merge markers

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: 0be6d0d6e06c21db0543dd9b0157ffed741090bd
      https://github.com/okfn/ckan/commit/0be6d0d6e06c21db0543dd9b0157ffed741090bd
  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:
  -----------
  [xs] Removed missed merge markers


  Commit: 80d576ec22e3dd24dffd4b99445972ba11dee9d2
      https://github.com/okfn/ckan/commit/80d576ec22e3dd24dffd4b99445972ba11dee9d2
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-13 (Tue, 13 Mar 2012)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
  M ckan/plugins/interfaces.py
  M ckan/public/scripts/application.js

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/okfn/ckan


Compare: https://github.com/okfn/ckan/compare/1f6c72d...80d576e