Merge previous checkins

2 files changed, 7 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
diff --git a/djangorestframework/tests/reverse.py b/djangorestframework/tests/reverse.py
index 28fee63b..63e2080a 100644
--- a/djangorestframework/tests/reverse.py
+++ b/djangorestframework/tests/reverse.py
@@ -5,7 +5,10 @@ from django.utils import simplejson as json
 
 from djangorestframework.resource import Resource
 
+<<<<<<< local
 
+=======
+>>>>>>> other
 
 class MockResource(Resource):
     """Mock resource which simply returns a URL, so that we can ensure that reversed URLs are fully qualified"""