[ckan-changes] [ckan/ckan] 8b0a6b: Fix test import - bad merge?

[David Read]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 8b0a6beeeb2b0266a453f4cf641dacb3085b3624
      https://github.com/ckan/ckan/commit/8b0a6beeeb2b0266a453f4cf641dacb3085b3624
  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?