diff options
Diffstat (limited to '_includes/header.html')
| -rw-r--r-- | _includes/header.html | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/_includes/header.html b/_includes/header.html index 4cdb0be..caaf0e5 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -9,12 +9,7 @@ </div> <nav class="navigation header__navigation"> <ul> -<<<<<<< b9aea514b507fe98e351c54dcd95f58b6342d8be - <li class="navigation__item"><a href="{{ site.baseurl }}/">Etusivu</a></li> -======= <li class="navigation__item"><a href="{{ '/home/' | prepend: site.baseurl}}">Etusivu</a></li> - <li class="navigation__item"><a href="{{ '/hallitus/' | prepend: site.baseurl }}">Hallitus</a></li> ->>>>>>> rebaseee <li class="navigation__item"><a href="{{ '/kilta/' | prepend: site.baseurl }}">Kilta</a></li> <li class="navigation__item"><a href="{{ '/opiskelu/' | prepend: site.baseurl }}">Opiskelu</a></li> <li class="navigation__item"><a href="{{ '/phuksit/' | prepend: site.baseurl }}">Uudet opiskelijat</a></li> |