[ckan-changes] [ckan/ckan] e91b70: [#1852] Fix merge error that was causing failures

[GitHub]

  Branch: refs/heads/1852-default-resource-views
  Home:   https://github.com/ckan/ckan
  Commit: e91b70ac187c6a1eb74b53779785e9d41245fc40
      https://github.com/ckan/ckan/commit/e91b70ac187c6a1eb74b53779785e9d41245fc40
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py

  Log Message:
  -----------
  [#1852] Fix merge error that was causing failures