web_programming_i/header.tpl at master · vsander2019/web_programming_i · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
<h3 class="w3-block w3-grey w3-center">Basic Todo List, version 1.1</h3>
<<<<<<< HEAD
<div class="w3-bar w3-black">
    <a href="/logout"><button class="w3-button w3-block w3-teal">Logout...</button></a>
    <a href="/login"><button class="w3-button w3-block w3-teal">Login...</button></a>
    <a href="/new_item"><button class="w3-button w3-block w3-teal">New item...</button></a>
=======
<div class="w3-bar w3-teal">
  <a href="/login"><button class="w3-bar-item w3-button">Login</button></a>
  <a href="/logout"><button class="w3-bar-item w3-button">Logout</button></a>
  <a href="/new_item"><button class="w3-bar-item w3-button">New item...</button></a>
>>>>>>> b2693012a90410afe5705293c2236191d9d3b702
</div>