From b18302586c0eeea2e09c799544b9c0a855e11755 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 27 Apr 2011 18:36:43 +0100
Subject: Urg.  Fix broken merging.

---
 djangorestframework/tests/reverse.py | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'djangorestframework/tests/reverse.py')

diff --git a/djangorestframework/tests/reverse.py b/djangorestframework/tests/reverse.py
index 63e2080a..49939d0e 100644
--- a/djangorestframework/tests/reverse.py
+++ b/djangorestframework/tests/reverse.py
@@ -5,10 +5,6 @@ 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"""
-- 
cgit v1.2.3