summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Misc/NEWS6
1 files changed, 1 insertions, 5 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index aff3c96c05..fb215ddd5b 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