[Python-checkins] cpython: Fix an incomplete merge of Misc/NEWS

[donald.stufft]

http://hg.python.org/cpython/rev/c29301b1503f
changeset:   89912:c29301b1503f
user:        Donald Stufft <donald at stufft.io>
date:        Fri Mar 21 21:49:38 2014 -0400
summary:
  Fix an incomplete merge of Misc/NEWS

files:
  Misc/NEWS |  5 ++---
  1 files changed, 2 insertions(+), 3 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -26,6 +26,8 @@
 - Issue #20995: Enhance default ciphers used by the ssl module to enable
   better security an prioritize perfect forward secrecy.
 
+- Issue #20884: Don't assume that __file__ is defined on importlib.__init__.
+
 - Issue #20627: xmlrpc.client.ServerProxy is now a context manager.
 
 - Issue #19165: The formatter module now raises DeprecationWarning instead of
@@ -43,9 +45,6 @@
 
 - Issue #20574: Implement incremental decoder for cp65001 code (Windows code
   page 65001, Microsoft UTF-8).
-=======
-- Issue #20884: Don't assume that __file__ is defined on importlib.__init__.
->>>>>>> other
 
 - Issue #20879: Delay the initialization of encoding and decoding tables for
   base32, ascii85 and base85 codecs in the base64 module, and delay the

-- 
Repository URL: http://hg.python.org/cpython