From 844f08137c0663a96739f6b68ed835cff9724779 Mon Sep 17 00:00:00 2001 From: Fabian Faessler Date: Sun, 29 Sep 2013 14:36:29 +0200 Subject: [PATCH] merge conflict again in models.py --- nsupdate/main/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nsupdate/main/models.py b/nsupdate/main/models.py index d3a9ecf..9434f5d 100644 --- a/nsupdate/main/models.py +++ b/nsupdate/main/models.py @@ -1,5 +1,5 @@ from django.db import models -from django.contrib.auth.models import User, AbstractUser +from django.contrib.auth.models import User from django.core.exceptions import ValidationError from django.core.validators import RegexValidator from django.forms import ModelForm