Fix tests/elevator_test: remove merge conflicts markers

oleiade · Mar 26, 2013 · 441ffa5 · 441ffa5
1 parent 2aaee0f
commit 441ffa5
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/tests/elevator_test.py b/tests/elevator_test.py
@@ -235,12 +235,8 @@ def test_slice_of_len_ten(self):
         for r in res:
             self.assertIsNotNone(r)
             self.assertIsInstance(r, tuple)
-<<<<<<< HEAD
-            self.assertEqual(r[0], r[1])
-=======
             # boostraped values are from 10 to 19
             self.assertEqual(int(r[1]), int(r[0]) + 10)
->>>>>>> devel
 
     def test_slice_of_len_ten_without_keys(self):
         res = self.client.Slice('0', 9, include_key=False)