From 3880210545d20070c9cb20998733c5fab309dea5 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Tue, 18 Dec 2007 22:00:19 +0000
Subject: [PATCH] Fixed merge glitch

---
 Misc/NEWS | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
index b041818e496..dcd3d335b15 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#