diff options
Diffstat (limited to 'django/db/models/query.py')
| -rw-r--r-- | django/db/models/query.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py index eba6f2f142..05d2514f69 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -3,8 +3,12 @@ The main QuerySet implementation. This provides the public API for the ORM. """ from copy import deepcopy +<<<<<<< HEAD:django/db/models/query.py from django.db import connections, transaction, IntegrityError, DEFAULT_DB_ALIAS +======= +from django.db import connection, transaction, IntegrityError +>>>>>>> master:django/db/models/query.py from django.db.models.aggregates import Aggregate from django.db.models.fields import DateField from django.db.models.query_utils import Q, select_related_descend, CollectedObjects, CyclicDependency, deferred_class_factory @@ -476,7 +480,11 @@ class QuerySet(object): def exists(self): if self._result_cache is None: +<<<<<<< HEAD:django/db/models/query.py return self.query.has_results(using=self.db) +======= + return self.query.has_results() +>>>>>>> master:django/db/models/query.py return bool(self._result_cache) ################################################## |