Bitbucket cannot automatically merge this request.
The commits that make up this pull request have been removed.
Bitbucket cannot automatically merge this request due to conflicts.
Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:
hg pull -r default https://bitbucket.org/chrischambers/django-threaded-multihost
This patch does break backwards compatibility, however. This could be reinstated with a statement like this:
from django.contrib.auth import get_user_model
from django.contrib.auth.models import User
get_user_model = lambda: User
But there will need to be corresponding test changes, and I'm not sure how best to make them given that the current tests are all doctests.
Edit: I notice hg-git has thrown up a couple of anomalies, like reinstating a removed test file - apologies. Feel free to just pull out the relevant edits.