From 3208a7f15dbe8d99253c3a397c354812ba883953 Mon Sep 17 00:00:00 2001
From: Ross Lawley <ross.lawley@gmail.com>
Date: Mon, 28 Jan 2013 14:28:40 +0000
Subject: [PATCH] Merge fix tests

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

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 8cf3bb5c..7c4e7853 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1725,9 +1725,6 @@ class FieldTest(unittest.TestCase):
 
         Shirt.drop_collection()
 
-<<<<<<< HEAD:tests/fields/fields.py
-=======
-
     def test_simple_choices_validation_invalid_value(self):
         """Ensure that error messages are correct.
         """
@@ -2060,7 +2057,6 @@ class FieldTest(unittest.TestCase):
         self.assertEqual(test_file.the_file.read(),
                           b('Hello, World!'))
 
->>>>>>> de5fbfde2ca96b93490e0bc96e04f3aa4affcfb5:tests/test_fields.py
     def test_geo_indexes(self):
         """Ensure that indexes are created automatically for GeoPointFields.
         """