From: Phillip J. Eby <pje@telecommunity.com>
Date: Fri, 28 Jul 2006 21:31:54 +0000 (+0000)
Subject: Fix svn merge spew.
X-Git-Tag: v2.5b3~98
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=84b7d3a932a620557b01f9ab6bea9dfbc0520a46;p=thirdparty%2FPython%2Fcpython.git

Fix svn merge spew.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 6dce888c117e..d470726fab7e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -111,14 +111,10 @@ Library
 Extension Modules
 -----------------
 
-<<<<<<< .mine
-- Bug #1471938: Fix curses module build problem on Solaris 8; patch by
-=======
 - The ``__reduce__()`` method of the new ``collections.defaultdict`` had
   a memory leak, affecting pickles and deep copies.
 
 - Bug #1471938: Fix curses module build problem on Solaris 8; patch by
->>>>>>> .r50915
   Paul Eggert.
 
 - Patch #1448199: Release interpreter lock in _winreg.ConnectRegistry.