Update .gitignore

timkpaine · web-flow · commit 361efba9c168 · 2026-04-05T17:52:49.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -114,11 +114,7 @@ index.md
 docs/_build/
 docs/api
 docs/html
-<<<<<<< before updating
-docs/wiki
-=======
 docs/index.md
->>>>>>> after updating
 docs/jupyter_execute
 docs/src/_build/
 docs/superpowers
