From: Stefan Behnel <scoder@users.berlios.de>
Date: Fri, 21 Aug 2009 12:33:25 +0000 (+0200)
Subject: fix test that was broken after merge
X-Git-Tag: 0.12.alpha0~226
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c820c9aa7832b546aea7f0a1b709907d99983402;p=cython.git

fix test that was broken after merge
---

diff --git a/tests/run/cdef_setitem_T284.pyx b/tests/run/cdef_setitem_T284.pyx
index 4438e4da..b5944366 100644
--- 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...