[ckan-changes] [ckan/ckan] 6e9463: Fix test import - bad merge?

[David Read]

  Branch: refs/heads/3484_revision_ui_removal2
  Home:   https://github.com/ckan/ckan
  Commit: 6e94632400fbc0694e5b8f94530aee611d0ee692
      https://github.com/ckan/ckan/commit/6e94632400fbc0694e5b8f94530aee611d0ee692
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2019-04-12 (Fri, 12 Apr 2019)

  Changed paths:
    M ckan/tests/model/test_license.py

  Log Message:
  -----------
  Fix test import - bad merge?