new style and projects

2023-12-08 23:01:23 +01:00
parent e9ce85de29
commit 712328de5b
7 changed files with 13 additions and 138 deletions
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@ -1,5 +1,4 @@
 main:
-<<<<<<< HEAD
  - title: "publications"
    url: /publications
  - title: "research"
@ -12,17 +11,4 @@ main:
  #   url: /blog
  - title: "about me"
    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)
+