From: Christian Heimes <christian@cheimes.de>
Date: Tue, 18 Dec 2007 22:00:19 +0000 (+0000)
Subject: Fixed merge glitch
X-Git-Tag: v2.5.2c1~101
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3880210545d20070c9cb20998733c5fab309dea5;p=python

Fixed merge glitch
---

diff --git a/Misc/NEWS b/Misc/NEWS
index b041818e49..dcd3d335b1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,8 +12,6 @@ What's New in Python 2.5.2c1?
 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 @@ Core and builtins
   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#