29 lines
570 B
YAML
29 lines
570 B
YAML
main:
|
|
<<<<<<< HEAD
|
|
- title: "publications"
|
|
url: /publications
|
|
- title: "research"
|
|
url: /research
|
|
- title: "projects"
|
|
url: /projects
|
|
- title: "teaching"
|
|
url: /teaching
|
|
# - title: "Blog"
|
|
# 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)
|