Fix Misc/NEWS merge conflict, hurray

diff --git a/Misc/NEWS b/Misc/NEWS
index 06483aa3e5d8fc9e8b22396356a9d5f94a14f207..d23f0a8e51e60c8efa00450328a460b279b3979b 100644 (file)
--- 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.