flo/nsupdate.info
1
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Releases Activity

merge conflict again in models.py

Browse Source
This commit is contained in:
Fabian Faessler 2013-09-29 14:36:29 +02:00
parent 2ffabb22b0
commit 844f08137c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nsupdate/main/models.py
View File

@ -1,5 +1,5 @@
from django.db import models 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.exceptions import ValidationError
from django.core.validators import RegexValidator from django.core.validators import RegexValidator
from django.forms import ModelForm from django.forms import ModelForm