ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 12:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Misc/NEWS merge conflict, hurray

Browse source
This commit is contained in:
Christian Heimes 2013-10-22 10:45:31 +02:00
parent efa48676d5
commit d1d7576fb4
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS
View file

@ -70,9 +70,6 @@ Core and Builtins
PyMem_Realloc().
- Issue #19199: Remove ``PyThreadState.tick_counter`` field
=======
- Issue #19279: UTF-7 decoder no more produces illegal strings.
>>>>>>> other
- Fix macro expansion of _PyErr_OCCURRED(), and make sure to use it in at
least one place so as to avoid regressions.