1 files changed, 5 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 9bea8c4..c7f5807 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1041,12 +1041,17 @@ Documentation
 Tools/Demos
 -----------
 
+<<<<<<< local
 - Issue #24000: Improved Argument Clinic's mapping of converters to legacy
   "format units".  Updated the documentation to match.
 
 - Issue #24001: Argument Clinic converters now use accept={type}
   instead of types={'type'} to specify the types the converter accepts.
 
+=======
+- Issue #25440: Fix output of python-config --extension-suffix.
+
+>>>>>>> other
 - Issue #23330: h2py now supports arbitrary filenames in #include.
 
 - Issue #24031: make patchcheck now supports git checkouts, too.