From f3f7f4d3fbe90d1599bd3348cecc9c5386c9c8ed Mon Sep 17 00:00:00 2001
From: Kostas Vilkelis <kostasvilkelis@gmail.com>
Date: Tue, 7 May 2024 21:42:50 +0200
Subject: [PATCH] resolve conflict
---
docs/source/index.md | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/docs/source/index.md b/docs/source/index.md
index 342f8ac..5bc8c55 100644
--- 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
```
--
GitLab