commit 3880210545d20070c9cb20998733c5fab309dea5
author Christian Heimes <christian@cheimes.de> Tue Dec 18 22:00:19 2007 +0000
committer Christian Heimes <christian@cheimes.de> Tue Dec 18 22:00:19 2007 +0000
tree fbc1cb0ba6ee9b5b8e777407372f1e253820fa48
parent 60d96cd54cc0b3f38275a5ddb93ad868526719a4

Fixed merge glitch

Misc/NEWS

diff --git a/Misc/NEWS b/Misc/NEWS
index b041818..dcd3d33 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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#