From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 12 Jan 2014 10:01:13 +0000 (+0200)
Subject: Fixed incorrect merge in 1638360eea41.
X-Git-Tag: v3.4.0b3~173
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c8dadc375e74321e0d74b9d4f98dca5bbd9728d0;p=thirdparty%2FPython%2Fcpython.git

Fixed incorrect merge in 1638360eea41.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index aff3c96c0516..fb215ddd5bbb 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -25,14 +25,10 @@ Core and Builtins
 Library
 -------
 
-<<<<<<< local
-- Issue #20152: Ported Python/import.c over to Argument Clinic.
-=======
 - Issue #19097: Raise the correct Exception when cgi.FieldStorage is given an
   Invalid fileobj.
 
-- Issue #20217: Fix build in SCHED_SPORADIC is defined.
->>>>>>> other
+- Issue #20152: Ported Python/import.c over to Argument Clinic.
 
 - Issue #13107: argparse and optparse no longer raises an exception when output
   a help on environment with too small COLUMNS.  Based on patch by