From: Martin Panter <vadmium+py@gmail.com>
Date: Tue, 14 Jun 2016 02:23:31 +0000 (+0000)
Subject: Issue #17500: Remove merge conflict scar tissue
X-Git-Tag: v3.6.0a3~171
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b76916463689d2cdcf468f7f1dd7b10dbee09bc8;p=thirdparty%2FPython%2Fcpython.git

Issue #17500: Remove merge conflict scar tissue
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 7493570057f2..69667a2c734a 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