diff options
| author | Georg Brandl <georg@python.org> | 2008-08-01 16:25:12 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2008-08-01 16:25:12 (GMT) |
| commit | ebd9af44c53dd17dd8f6f2a60697ed6ee885e1d5 (patch) | |
| tree | ae17553d45f2a28f01f5db4a647b441bc6bf9d24 /Misc | |
| parent | 33df74ae129ff56fb07e2a7283652640624ee8c1 (diff) | |
| download | cpython-ebd9af44c53dd17dd8f6f2a60697ed6ee885e1d5.zip cpython-ebd9af44c53dd17dd8f6f2a60697ed6ee885e1d5.tar.gz cpython-ebd9af44c53dd17dd8f6f2a60697ed6ee885e1d5.tar.bz2 | |
Fix merge conflict.
Diffstat (limited to 'Misc')
| -rw-r--r-- | Misc/NEWS | 14 |
1 files changed, 0 insertions, 14 deletions
@@ -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? =========================== |