From 2ffabb22b0ddcebdd0a9f632913bd4d6fc86ec5b Mon Sep 17 00:00:00 2001 From: Fabian Faessler Date: Sun, 29 Sep 2013 14:35:37 +0200 Subject: [PATCH] merge conflict in models.py --- nsupdate/main/models.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nsupdate/main/models.py b/nsupdate/main/models.py index 6b91afd..d3a9ecf 100644 --- a/nsupdate/main/models.py +++ b/nsupdate/main/models.py @@ -1,11 +1,7 @@ from django.db import models -<<<<<<< HEAD from django.contrib.auth.models import User, AbstractUser -======= from django.core.exceptions import ValidationError from django.core.validators import RegexValidator -from django.contrib.auth.models import User ->>>>>>> ebcbc5ed4aeeac29b73d095e8d6478f23440717a from django.forms import ModelForm from django.conf import settings from django.contrib.auth.hashers import make_password