From d1d7576fb4a6787e3ebc0b5060561c076c9a4bf7 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Tue, 22 Oct 2013 10:45:31 +0200
Subject: [PATCH] Fix Misc/NEWS merge conflict, hurray

---
 Misc/NEWS | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
index 06483aa3e5..d23f0a8e51 100644
--- 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.
-- 
2.49.0