From: Berker Peksag <berker.peksag@gmail.com>
Date: Wed, 21 Oct 2015 13:38:36 +0000 (+0300)
Subject: Fix merge conflict artifacts and move the entry to correct place
X-Git-Tag: v3.5.1rc1~139
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4da71055e1aca0b9a047b5a3405cedf3c4c661f6;p=thirdparty%2FPython%2Fcpython.git

Fix merge conflict artifacts and move the entry to correct place
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 70b03ee12efe..30d5f5e7b9b5 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -366,6 +366,12 @@ Windows
 
 - Issue #25022: Removed very outdated PC/example_nt/ directory.
 
+Tools/Demos
+-----------
+
+- Issue #25440: Fix output of python-config --extension-suffix.
+
+
 What's New in Python 3.5.0 final?
 =================================
 
@@ -1045,17 +1051,12 @@ Documentation
 Tools/Demos
 -----------
 
-<<<<<<< local
 - Issue #24000: Improved Argument Clinic's mapping of converters to legacy
   "format units".  Updated the documentation to match.
 
 - Issue #24001: Argument Clinic converters now use accept={type}
   instead of types={'type'} to specify the types the converter accepts.
 
-=======
-- Issue #25440: Fix output of python-config --extension-suffix.
-
->>>>>>> other
 - Issue #23330: h2py now supports arbitrary filenames in #include.
 
 - Issue #24031: make patchcheck now supports git checkouts, too.