Issue #17500: Remove merge conflict scar tissue

diff --git a/Misc/NEWS b/Misc/NEWS
index 7493570057f2cf46ec148eb9dff6cee4878dd47b..69667a2c734ab7d1f46f269419c47a9c4b5574c9 100644 (file)
--- 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