[ckan-changes] [okfn/ckan] 935a35: Fix for bad merge

[GitHub]

  Branch: refs/heads/2941-follower-support
  Home:   https://github.com/okfn/ckan
  Commit: 935a3559ba71086a4c3c12604e163126d1eed1f8
      https://github.com/okfn/ckan/commit/935a3559ba71086a4c3c12604e163126d1eed1f8
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-17 (Wed, 17 Oct 2012)

  Changed paths:
    M ckan/public/base/javascript/resource.config

  Log Message:
  -----------
  Fix for bad merge