From b76916463689d2cdcf468f7f1dd7b10dbee09bc8 Mon Sep 17 00:00:00 2001 From: Martin Panter Date: Tue, 14 Jun 2016 02:23:31 +0000 Subject: Issue #17500: Remove merge conflict scar tissue --- Misc/NEWS | 1 - 1 file changed, 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index 7493570..69667a2 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -1573,7 +1573,6 @@ Tools/Demos - 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 -- cgit v0.12