Skip to content

Commit

Permalink
Merge pull request #81 from mexicat/patch-1
Browse files Browse the repository at this point in the history
Merged two imports into one
  • Loading branch information
julianandrews committed May 2, 2017
2 parents a5ea51d + fc0c5f5 commit 8ac6d0e
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions authtools/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@

from django.core.mail import send_mail
from django.db import models
from django.contrib.auth.models import AbstractBaseUser, PermissionsMixin
from django.contrib.auth.models import AbstractBaseUser, BaseUserManager, PermissionsMixin
from django.utils.translation import ugettext_lazy as _
from django.utils import timezone
from django.utils.encoding import python_2_unicode_compatible
from django.contrib.auth.models import BaseUserManager


class UserManager(BaseUserManager):
Expand Down

0 comments on commit 8ac6d0e

Please sign in to comment.