[Python-3000-checkins] r65371 - python/branches/py3k/Misc/NEWS
georg.brandl
python-3000-checkins at python.org
Fri Aug 1 18:25:13 CEST 2008
Author: georg.brandl
Date: Fri Aug 1 18:25:12 2008
New Revision: 65371
Log:
Fix merge conflict.
Modified:
python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Fri Aug 1 18:25:12 2008
@@ -26,22 +26,8 @@
file name rather than a ZipInfo instance, so files are extracted with
mode 0600 rather than 000 under Unix.
-<<<<<<< .working
- Issue #2523: Fix quadratic behaviour when read()ing a binary file without
asking for a specific length.
-=======
-Build
------
->>>>>>> .merge-right.r65368
-
-<<<<<<< .working
-=======
-- Generate the PatternGrammar pickle during "make install".
-
-
-What's New in Python 2.6 beta 2?
-================================
->>>>>>> .merge-right.r65368
What's new in Python 3.0b2?
===========================
More information about the Python-3000-checkins
mailing list