summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhillip J. Eby <pje@telecommunity.com>2006-07-28 21:31:54 +0000
committerPhillip J. Eby <pje@telecommunity.com>2006-07-28 21:31:54 +0000
commit84b7d3a932a620557b01f9ab6bea9dfbc0520a46 (patch)
tree3583434814724cc38d12ed6d37fdde8d00778cae
parentf7575d0cb7a10b252cc1e05a1d24facc2294a195 (diff)
downloadcpython-git-84b7d3a932a620557b01f9ab6bea9dfbc0520a46.tar.gz
Fix svn merge spew.
-rw-r--r--Misc/NEWS4
1 files changed, 0 insertions, 4 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 6dce888c11..d470726fab 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.