diff options
Diffstat (limited to 'djangorestframework/tests/authentication.py')
| -rw-r--r-- | djangorestframework/tests/authentication.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/djangorestframework/tests/authentication.py b/djangorestframework/tests/authentication.py index f2c249a6..a43a87b3 100644 --- a/djangorestframework/tests/authentication.py +++ b/djangorestframework/tests/authentication.py @@ -1,8 +1,12 @@ from django.conf.urls.defaults import patterns +<<<<<<< local from django.test import TestCase from django.test import Client from django.contrib.auth.models import User from django.contrib.auth import login +======= +from django.test import Client, TestCase +>>>>>>> other from django.utils import simplejson as json from djangorestframework.compat import RequestFactory |