summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-03-21 16:09:41 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-03-21 16:09:41 +0000
commit570c12aeb8812753c61a9d5f247f09822bda91d2 (patch)
tree39c3cf1ca3298a612a681b19948e4c27e5149771
parent0187f53f09db562faf573179f1c149718552a3d9 (diff)
queryset-refactor: People are getting picky about my spelling.
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@7346 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/db/models/query.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py
index 1cc3bbeec4..994425272b 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -120,7 +120,7 @@ class _QuerySet(object):
def _merge_sanity_check(self, other):
"""
- Checks that we are merging two comparable queyrset classes.
+ Checks that we are merging two comparable queryset classes.
"""
if self.__class__ is not other.__class__:
raise TypeError("Cannot merge querysets of different types ('%s' and '%s'."