Fix Misc/NEWS merge conflict, hurray

2013-10-22 10:45:31 +02:00 · 2013-10-22 10:45:31 +02:00 · d1d7576fb4
parent efa48676d5
commit d1d7576fb4
1 changed files with 0 additions and 3 deletions
--- a/Misc/NEWS
+++ b/Misc/NEWS
@ -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.