[Python-checkins] cpython (3.5): Fix merge conflict artifacts and move the entry to correct place
berker.peksag
python-checkins at python.org
Wed Oct 21 09:39:44 EDT 2015
https://hg.python.org/cpython/rev/4bbc2af93b52
changeset: 98817:4bbc2af93b52
branch: 3.5
parent: 98815:dc2deecb2346
user: Berker Peksag <berker.peksag at gmail.com>
date: Wed Oct 21 16:38:36 2015 +0300
summary:
Fix merge conflict artifacts and move the entry to correct place
files:
Misc/NEWS | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -366,6 +366,12 @@
- 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 @@
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.
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list