Fixed incorrect merge in 1638360eea41.

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