Issue #17500: Remove merge conflict scar tissue

This commit is contained in:
Martin Panter 2016-06-14 02:23:31 +00:00
parent e371599004
commit b769164636

View file

@ -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