rebase from mnml mistakes source

2023-12-03 18:05:58 +01:00
parent 5863542848
commit e9ce85de29
52 changed files with 857 additions and 1781 deletions
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@ -1,4 +1,5 @@
 main:
+<<<<<<< HEAD
  - title: "publications"
    url: /publications
  - title: "research"
@ -10,4 +11,18 @@ main:
  # - title: "Blog"
  #   url: /blog
  - title: "about me"
-    url: /about
+    url: /about
+=======
+  - title: "teaching"
+    url: /teaching
+  #- title: "Projects"
+  #  url: /projects
+  - title: "research"
+    url: /research
+  # - title: "Blog"
+  #   url: /blog
+  - title: "publications"
+    url: /publications
+  #- title: "CV"
+  #  url: /cv
+>>>>>>> d0fa738f (rebase from mnml mistakes source)