From: Christian Heimes <christian@cheimes.de>
Date: Tue, 22 Oct 2013 08:45:31 +0000 (+0200)
Subject: Fix Misc/NEWS merge conflict, hurray
X-Git-Tag: v3.4.0b1~571^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1d7576fb4a6787e3ebc0b5060561c076c9a4bf7;p=thirdparty%2FPython%2Fcpython.git

Fix Misc/NEWS merge conflict, hurray
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 06483aa3e5d8..d23f0a8e51e6 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.