Update conf.py

numpy · Jun 3, 2024 · eab1704 · eab1704
1 parent e54ca64
commit eab1704
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/doc/conf.py b/doc/conf.py
@@ -138,14 +138,6 @@
 
 # -- Intersphinx setup ----------------------------------------------------
 
-# Example configuration for intersphinx: refer to the Python standard library.
-<<<<<<< intersphinx_registry
+# Example configuration for intersphinx: refer to several Python libraries.
 
 intersphinx_mapping = get_intersphinx_mapping(packages=["python", "numpy", "sklearn"])
-=======
-intersphinx_mapping = {
-    "python": ("https://docs.python.org/3/", None),
-    "numpy": ("https://numpy.org/doc/stable/", None),
-    "sklearn": ("https://scikit-learn.org/stable/", None),
-}
->>>>>>> main