https://hg.python.org/cpython/rev/d9090aa75607 changeset: 101990:d9090aa75607 parent: 101987:9ba934d159e3 user: Martin Panter <vadmium+py at gmail.com> date: Tue Jun 14 02:23:31 2016 +0000 summary: Issue #17500: Remove merge conflict scar tissue files: Misc/NEWS | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -1573,7 +1573,6 @@ - Issue #26316: Fix variable name typo in Argument Clinic. -<<<<<<< local - Issue #25440: Fix output of python-config --extension-suffix. - Issue #25154: The pyvenv script has been deprecated in favour of -- Repository URL: https://hg.python.org/cpython