https://github.com/python/cpython/commit/d8ff4f8e56217133be6e22592aa60a1fab331d8e commit: d8ff4f8e56217133be6e22592aa60a1fab331d8e branch: main author: Petr Viktorin <[email protected]> committer: encukou <[email protected]> date: 2026-05-27T14:20:50Z summary:
gh-141984: Remove accidental merge markers (GH-150517) files: M Doc/tools/removed-ids.txt diff --git a/Doc/tools/removed-ids.txt b/Doc/tools/removed-ids.txt index 6f912b8b86c6ed..be00d48bf042f6 100644 --- a/Doc/tools/removed-ids.txt +++ b/Doc/tools/removed-ids.txt @@ -12,7 +12,7 @@ using/configure.html: cmdoption-with-system-libmpdec # Removed APIs library/symtable.html: symtable.Class.get_methods library/sys.html: sys._enablelegacywindowsfsencoding -<<<<<<<< HEAD +c-api/import.html: c.PyImport_LazyImportsMode.PyImport_LAZY_NONE ## Old names for grammar tokens reference/expressions.html: grammar-token-python-grammar-comp_for @@ -26,7 +26,3 @@ reference/expressions.html: grammar-token-python-grammar-enclosure reference/expressions.html: grammar-token-python-grammar-list_display reference/expressions.html: grammar-token-python-grammar-parenth_form reference/expressions.html: grammar-token-python-grammar-set_display -|||||||| 50476a7e879 -======== -c-api/import.html: c.PyImport_LazyImportsMode.PyImport_LAZY_NONE ->>>>>>>> origin/main _______________________________________________ Python-checkins mailing list -- [email protected] To unsubscribe send an email to [email protected] https://mail.python.org/mailman3//lists/python-checkins.python.org Member address: [email protected]
