VelogaWhite commited on
Commit
748a538
·
1 Parent(s): ddc619f

Fix list.html due to merge issue

Browse files
Files changed (1) hide show
  1. src/lists/templates/list.html +0 -7
src/lists/templates/list.html CHANGED
@@ -5,12 +5,6 @@
5
  {% block form_action %}/lists/{{ list.id }}/add_item{% endblock %}
6
 
7
  {% block table %}
8
- <<<<<<< HEAD
9
- <table class="table" id="id_list_table">
10
- {% for item in list.item_set.all %}
11
- <tr><td>{{ forloop.counter }}: {{ item.text }} ({{ item.priority }})</td></tr>
12
- {% endfor %}
13
- =======
14
  <table class="table table-hover mt-3" id="id_list_table">
15
  <thead class="table-light">
16
  <tr>
@@ -48,6 +42,5 @@
48
  </tr>
49
  {% endfor %}
50
  </tbody>
51
- >>>>>>> origin/feature/completed-priority
52
  </table>
53
  {% endblock %}
 
5
  {% block form_action %}/lists/{{ list.id }}/add_item{% endblock %}
6
 
7
  {% block table %}
 
 
 
 
 
 
8
  <table class="table table-hover mt-3" id="id_list_table">
9
  <thead class="table-light">
10
  <tr>
 
42
  </tr>
43
  {% endfor %}
44
  </tbody>
 
45
  </table>
46
  {% endblock %}