fix test that was broken after merge

diff --git a/tests/run/cdef_setitem_T284.pyx b/tests/run/cdef_setitem_T284.pyx
index 4438e4daa095631954397af250e6a034025d4a85..b59443663dacf82998755c3fdbdce068a1cc27e4 100644 (file)
--- a/tests/run/cdef_setitem_T284.pyx
+++ b/tests/run/cdef_setitem_T284.pyx
@@ -1,19 +1,9 @@
 __doc__ = u'''
 >>> no_cdef()
 >>> with_cdef()
-<<<<<<< local
-
->>> test_list(range(11), -2, None)
-=======
 >>> test_list(list(range(11)), -2, None)
->>>>>>> other
 [0, 1, 2, 3, 4, 5, 6, 7, 8, None, 10]
-<<<<<<< local
-
->>> test_list(range(11), "invalid index", None)
-=======
 >>> test_list(list(range(11)), "invalid index", None) #doctest: +ELLIPSIS
->>>>>>> other
 Traceback (most recent call last):
 ...
 TypeError: list indices must be integers...