resolve conflict

f3f7f4d3 · Kostas Vilkelis · 3a658512 · f3f7f4d3
Commit f3f7f4d3 authored 10 months ago by Kostas Vilkelis
--- a/docs/source/index.md
+++ b/docs/source/index.md
@@ -18,7 +18,6 @@ kernelspec:
 :maxdepth: 1
 :caption: Tutorials

-<<<<<<< HEAD

 mf_notes.md
 algorithm.md
@@ -34,17 +33,6 @@ graphene_example.md

 mf_notes.md
 algorithm.md
-=======
-```
-
-```{toctree}
-:hidden:
-:maxdepth: 1
-:caption: Documentation
-
-mf_notes.md
-algorithm.md
->>>>>>> main
 documentation/pymf.md
 ```