Fix merge errors

django-cms · Apr 19, 2024 · 513318c · 513318c
1 parent 566cbf4
commit 513318c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/cms/utils/plugins.py b/cms/utils/plugins.py
@@ -299,10 +299,10 @@ def get_bound_plugins(plugins):
     Finally, iterates over the plugins and yields the downcasted versions if they have a valid parent.
     Does not affect caching.
 
-    :param plugins: (list) List of ``CMSPlugin`` instances.
-
-    Yields:
-    - instance (``CMSPlugin`` sub-class): Downcasted Plugin instance.
+    :param plugins:  List of ``CMSPlugin`` instances.
+    :type plugins: List[CMSPlugin]
+    :return: Generator that yields the downcasted plugins.
+    :rtype: Generator[CMSPlugin, None, None]
 
     Example::
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -152,7 +152,7 @@
     html_theme_options = {
         "navigation_with_keys": True,
     }
-except ImportError: 
+except ImportError:
     html_theme = 'default'