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

Fixed merge glitch, second try
---

diff --git a/Misc/NEWS b/Misc/NEWS
index dcd3d335b1..230cd47eee 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -14,16 +14,6 @@ Core and builtins
 
 - Issue #1638: %zd configure test fails on Linux
 
-- Issue #1620: New property decorator syntax was modifying the decorator
-  in place instead of creating a new decorator object.
-
-- Issue #1580: New free format floating point representation based on
-  "Floating-Point Printer Sample Code", by Robert G. Burger. For example
-  repr(11./5) now returns '2.2' instead of '2.2000000000000002'.
-
-- Issue #1538: Avoid copying string in split/rsplit if the split
-  char is not found.
-
 - Issue #1553: An erroneous __length_hint__ can make list() raise a
   SystemError.