update docs dependencies

willingc · Nov 15, 2023 · c69a578 · c69a578
1 parent 15ea2cb
commit c69a578
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -6,5 +6,8 @@ furo>=2023.9.10
 myst-parser>=2.0.0
 moto>=4.2.8
 sphinx-copybutton>=0.5.2
+<<<<<<< HEAD
 nbformat
 entrypoints
+=======
+>>>>>>> 40bc794 (update docs dependencies)