gh-141984: Remove accidental merge markers (GH-150517)

diff --git a/Doc/tools/removed-ids.txt b/Doc/tools/removed-ids.txt
index 6f912b8b86c6ed7a9608a41a876936a260f962ad..be00d48bf042f6360033350a4259e74a325e42c9 100644 (file)
--- 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