[Python-checkins] r59555 - python/branches/release25-maint/Misc/NEWS

christian.heimes python-checkins at python.org
Tue Dec 18 23:00:19 CET 2007


Author: christian.heimes
Date: Tue Dec 18 23:00:19 2007
New Revision: 59555

Modified:
   python/branches/release25-maint/Misc/NEWS
Log:
Fixed merge glitch

Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Tue Dec 18 23:00:19 2007
@@ -12,8 +12,6 @@
 Core and builtins
 -----------------
 
-- Issue #1553: An errornous __length_hint__ can make list() raise a 
-
 - Issue #1638: %zd configure test fails on Linux
 
 - Issue #1620: New property decorator syntax was modifying the decorator
@@ -27,7 +25,6 @@
   char is not found.
 
 - Issue #1553: An erroneous __length_hint__ can make list() raise a
->>>>>>> .merge-rechts.r59533
   SystemError.
 
 - Issue #1521: On 64bit platforms, using PyArgs_ParseTuple with the t# of w#


More information about the Python-checkins mailing list