diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-06-14 02:23:31 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-06-14 02:23:31 (GMT) |
| commit | b76916463689d2cdcf468f7f1dd7b10dbee09bc8 (patch) | |
| tree | ff379f1891c1539f2e60e3a5da23858d37377a18 | |
| parent | e371599004698934701ccf512f3cfdbde1cb5fa2 (diff) | |
| download | cpython-b76916463689d2cdcf468f7f1dd7b10dbee09bc8.zip cpython-b76916463689d2cdcf468f7f1dd7b10dbee09bc8.tar.gz cpython-b76916463689d2cdcf468f7f1dd7b10dbee09bc8.tar.bz2 | |
Issue #17500: Remove merge conflict scar tissue
| -rw-r--r-- | Misc/NEWS | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -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 |