Author: Alex Gaynor <alex.gay...@gmail.com>
Branch: stdlib-2.7.9
Changeset: r74931:06eaf68b7f7c
Date: 2014-12-14 10:46 -0800
http://bitbucket.org/pypy/pypy/changeset/06eaf68b7f7c/
Log: Resolved merge conflicts in test_file2k.py
diff --git a/lib-python/2.7/test/test_file2k.py
b/lib-python/2.7/test/test_file2k.py
--- a/lib-python/2.7/test/test_file2k.py
+++ b/lib-python/2.7/test/test_file2k.py
@@ -14,11 +14,7 @@
threading = None
from test import test_support
-<<<<<<< local
-from test.test_support import TESTFN, run_unittest, gc_collect
-=======
-from test.test_support import TESTFN, run_unittest, requires
->>>>>>> other
+from test.test_support import TESTFN, run_unittest, gc_collect, requires
from UserList import UserList
class AutoFileTests(unittest.TestCase):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
