Fix svn merge spew.

diff --git a/Misc/NEWS b/Misc/NEWS
index 6dce888c117e94728c56dfa86bae43588d2c2a82..d470726fab7e8ccd1b897349fb6a8152c69b3dbf 100644 (file)
--- 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.