changeset:   101990:d9090aa75607
parent:      101987:9ba934d159e3
user:        Martin Panter <vadmium+py@gmail.com>
date:        Tue Jun 14 02:23:31 2016 +0000
files:       Misc/NEWS
description:
Issue #17500: Remove merge conflict scar tissue


diff -r 9ba934d159e3 -r d9090aa75607 Misc/NEWS
--- a/Misc/NEWS	Mon Jun 13 20:27:57 2016 -0400
+++ b/Misc/NEWS	Tue Jun 14 02:23:31 2016 +0000
@@ -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