[Python-checkins] cpython: Fix Misc/NEWS merge conflict, hurray

[christian.heimes]

http://hg.python.org/cpython/rev/9b2d5d186144
changeset:   86564:9b2d5d186144
parent:      86562:b5cc822d5bf0
user:        Christian Heimes <christian at cheimes.de>
date:        Tue Oct 22 10:45:31 2013 +0200
summary:
  Fix Misc/NEWS merge conflict, hurray

files:
  Misc/NEWS |  3 ---
  1 files changed, 0 insertions(+), 3 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -70,9 +70,6 @@
   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.

-- 
Repository URL: http://hg.python.org/cpython