search

jgthms / bulma-website

[DEPRECATED] Website for the Bulma CSS framework
http://bulma.io
MIT License
40 stars 35 forks source link

Merge conflict message in Nav example #55

Open evansb opened 8 years ago

evansb commented 8 years ago

There is unresolved merge conflict messages in the source code of Nav example. http://bulma.io/documentation/components/nav/

<nav class="nav">
  <div class="nav-left">
<<<<<<< HEAD
    <a class="nav-item is-brand" href="#">
      <img src="/images/bulma.png" alt="Bulma logo}">
=======
    <a class="nav-item" href="#">
      <img src="/images/bulma.png" alt="Bulma logo">
>>>>>>> master
    </a>
  </div>

  <div class="nav-center">
    <a class="nav-item" href="#">
      <span class="icon">
        <i class="fa fa-github"></i>
      </span>
    </a>