Skip to content

Commit

Permalink
conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
tang-mm committed Dec 11, 2023
1 parent c9aec93 commit 97a9728
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions docs/.sphinx/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

0 comments on commit 97a9728

Please sign in to comment.