From: Donald Stufft <donald@stufft.io>
Date: Sat, 22 Mar 2014 01:49:38 +0000 (-0400)
Subject: Fix an incomplete merge of Misc/NEWS
X-Git-Tag: v3.5.0a1~2055
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04ea84a20da667e39790827b978b21732753bd91;p=python

Fix an incomplete merge of Misc/NEWS
---

diff --git a/Misc/NEWS b/Misc/NEWS
index b914fb372d..bfe93e5b85 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -26,6 +26,8 @@ Library
 - 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 @@ Library
 
 - 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