traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix merge conflict.

This commit is contained in:
Georg Brandl 2008-08-01 16:25:12 +00:00
parent 33df74ae12
commit ebd9af44c5
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Misc/NEWS
View File

@ -26,22 +26,8 @@ Library
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?
===========================