Author: Antonio Cuni <anto.c...@gmail.com>
Branch: py3k
Changeset: r54413:801e0d2f2fce
Date: 2012-04-16 15:30 +0200
http://bitbucket.org/pypy/pypy/changeset/801e0d2f2fce/
Log: bah, kill leftover from the merge
diff --git a/pypy/module/sys/test/test_sysmodule.py
b/pypy/module/sys/test/test_sysmodule.py
--- a/pypy/module/sys/test/test_sysmodule.py
+++ b/pypy/module/sys/test/test_sysmodule.py
@@ -658,4 +658,3 @@
class AppTestSysExcInfoDirectCallMethod(AppTestSysExcInfoDirect):
def setup_class(cls):
cls.space = gettestobjspace(**{"objspace.opcodes.CALL_METHOD": True})
->>>>>>> other
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
