Fixed incorrect merge in 1638360eea41.

c8dadc37 · Serhiy Storchaka · f9bba9c6 · c8dadc37
Commit c8dadc37 authored Jan 12, 2014 by Serhiy Storchaka
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

Misc/NEWS Misc/NEWS +1 -5

No files found.
--- 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