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:
git checkout master
git merge --no-ff -m 'Merged in xf-auth (pull request #2)' remotes/origin/xf-auth
This authentication backend will migrate users to Django's User model