patx/micropie

fix codex review error

Commit 1f9e592 · patx · 2025-10-20T00:57:20-04:00

Changeset

1f9e5922aca667d80eb69b560160864e62a4bc99

Parents

3ca4cea668fc48f60819acd63c865086d04f4982

View source at this commit

Comments

No comments yet.

Log in to comment

Diff

diff --git a/docs/apidocs/conf.py b/docs/apidocs/conf.py
index 6f33842..3114105 100644
--- a/docs/apidocs/conf.py
+++ b/docs/apidocs/conf.py
@@ -21,13 +21,8 @@ napoleon_numpy_docstring = False
 todo_include_todos = True
 
 intersphinx_mapping = {
-<<<<<<< ours
     "python": ("https://docs.python.org/3", {}),
     "asgiref": ("https://asgiref.readthedocs.io/en/latest", {}),
-=======
-    "python": ("https://docs.python.org/3", None),
-    "asgiref": ("https://asgiref.readthedocs.io/en/latest", None),
->>>>>>> theirs
 }
 
 templates_path = ["_templates"]