diff --git a/docs/conf.py b/docs/conf.py index a5c5db99..0a96bb3a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -62,15 +62,9 @@ # -- General configuration --------------------------------------------------- -<<<<<<< -======= # Wrap large function/method signatures maximum_signature_line_length = 80 -# Add any Sphinx extension module names here, as strings. They can be -# extensions coming with Sphinx (named "sphinx.ext.*") or your custom -# ones. ->>>>>>> # Suppress warnings about overriding directives as we overload some of the # doctest extensions. suppress_warnings = ["app.add_directive", ]