Merge branch 'docs' of github.com:jgthms/bulma into docs

2016-09-11 11:57:43 +01:00 · 2016-09-11 11:57:43 +01:00 · f05f20d2d2
commit f05f20d2d2
parent f972f32a77 6d9a51cf48
1 changed files with 0 additions and 5 deletions
--- a/docs/documentation/components/nav.html
+++ b/docs/documentation/components/nav.html
@ -92,13 +92,8 @@ doc-subtab: nav
 {% highlight html %}
 <nav class="nav">
  <div class="nav-left">
-<<<<<<< HEAD
    <a class="nav-item is-brand" href="#">
-      <img src="{{ site.baseurl }}/images/bulma.png" alt="Bulma logo}">
-=======
-    <a class="nav-item" href="#">
      <img src="{{ site.baseurl }}/images/bulma.png" alt="Bulma logo">
->>>>>>> master
    </a>
  </div>