feat: TNL-10136 fix small rebase errors

Too many blank lines, missing import between student model files
This commit is contained in:
Bernard Szabo
2022-12-13 18:23:13 -05:00
parent 6e75002bb4
commit 6d25e192f1
2 changed files with 1 additions and 3 deletions

View File

@@ -56,7 +56,6 @@ log = logging.getLogger(__name__)
AUDIT_LOG = logging.getLogger("audit")
# ENROLL signal used for free enrollment only
class EnrollStatusChange:
"""

View File

@@ -25,6 +25,7 @@ from .course_enrollment import (
ALLOWEDTOENROLL_TO_ENROLLED,
CourseEnrollment,
CourseEnrollmentAllowed,
CourseOverview,
ManualEnrollmentAudit,
segment
)
@@ -951,8 +952,6 @@ class PendingSecondaryEmailChange(DeletableByUserValue, models.Model):
activation_key = models.CharField(('activation key'), max_length=32, unique=True, db_index=True)
class LoginFailures(models.Model):
"""
This model will keep track of failed login attempts.