From: Petr Viktorin <encukou@gmail.com>
Date: Wed, 27 May 2026 14:20:50 +0000 (+0200)
Subject: gh-141984: Remove accidental merge markers (GH-150517)
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=d8ff4f8e56217133be6e22592aa60a1fab331d8e;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Doc/tools/removed-ids.txt b/Doc/tools/removed-ids.txt
index 6f912b8b86c6..be00d48bf042 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