conflict

canonical · Dec 11, 2023 · 03e3f01 · 03e3f01
1 parent c9aec93
commit 03e3f01
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/docs/.sphinx/requirements.txt b/docs/.sphinx/requirements.txt
@@ -13,8 +13,5 @@ lxd-sphinx-extensions
 sphinx-copybutton
 myst-parser
 setuptools-scm
-<<<<<<< HEAD
 sphinx-jsonschema
-=======
 sphinxcontrib-mermaid
->>>>>>> 175d8cdc2 (add sphinx plugin that enables mermaid diagrams)
diff --git a/docs/conf.py b/docs/conf.py
@@ -54,7 +54,7 @@
     'sphinx_copybutton',
     'sphinxext.opengraph',
     'myst_parser',
-    'sphinx-jsonschema'
+    'sphinx-jsonschema',
     'sphinxcontrib.mermaid'
     ]