summaryrefslogtreecommitdiff
path: root/django/db/models/__init__.py
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2006-06-06 12:30:26 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2006-06-06 12:30:26 +0000
commit86d585a0a167f15e0176ea36fe9f99fc1d85a200 (patch)
tree380215d9533d93786d542463303667149f1e5c4e /django/db/models/__init__.py
parent0909c97e607967be1f12c65a2b49ab0be7c0ef9b (diff)
Backed out [3088] which was a premature commit with a message meant for another term window :)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3089 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/__init__.py')
-rw-r--r--django/db/models/__init__.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/django/db/models/__init__.py b/django/db/models/__init__.py
index 4f462cd4c2..d708fa60bc 100644
--- a/django/db/models/__init__.py
+++ b/django/db/models/__init__.py
@@ -8,7 +8,6 @@ from django.db.models.manager import Manager
from django.db.models.base import Model, AdminOptions
from django.db.models.fields import *
from django.db.models.fields.related import ForeignKey, OneToOneField, ManyToManyField, ManyToOneRel, ManyToManyRel, OneToOneRel, TABULAR, STACKED
-from django.db.models.fields.generic_relations import GenericRelation
from django.db.models import signals
from django.utils.functional import curry
from django.utils.text import capfirst