Author: Antonio Cuni <[email protected]>
Branch: jitypes2
Changeset: r44230:422d0cda79cc
Date: 2011-05-17 10:18 +0200
http://bitbucket.org/pypy/pypy/changeset/422d0cda79cc/
Log: kill this leftover of a merge
diff --git a/pypy/module/pypyjit/test/test_pypy_c.py
b/pypy/module/pypyjit/test/test_pypy_c.py
--- a/pypy/module/pypyjit/test/test_pypy_c.py
+++ b/pypy/module/pypyjit/test/test_pypy_c.py
@@ -247,7 +247,6 @@
return total
''' % startvalue, 170, ([], startvalue + 4999450000L))
-<<<<<<< local
def test_boolrewrite_invers(self):
for a, b, res, ops in (('2000', '2000', 20001000, 51),
( '500', '500', 15001500, 81),
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
