commit 84b7d3a932a620557b01f9ab6bea9dfbc0520a46
author Phillip J. Eby <pje@telecommunity.com> Fri Jul 28 21:31:54 2006 +0000
committer Phillip J. Eby <pje@telecommunity.com> Fri Jul 28 21:31:54 2006 +0000
tree 3583434814724cc38d12ed6d37fdde8d00778cae
parent f7575d0cb7a10b252cc1e05a1d24facc2294a195

Fix svn merge spew.

Misc/NEWS

diff --git a/Misc/NEWS b/Misc/NEWS
index 6dce888..d470726 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -111,14 +111,10 @@
 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.