fix master confl

This commit is contained in:
Kanris
2021-05-30 01:16:09 +03:00
4 changed files with 65 additions and 48 deletions

View File

@@ -61,16 +61,17 @@
<div class="col-5 mb-3 py-1">
<div class="row mb-2">
<div class="col">
<a href="/work/become_engineer" class="btn btn-success btn-block py-3">Получить права инженера</a>
<a href="{% url 'work_become_engineer' %}" class="btn btn-success btn-block py-3">Получить права инженера</a>
</div>
</div>
<div class="row mb-2 py-1">
<div class="col">
<a href="/work/hand_over" class="btn btn-danger btn-block py-3">Сдать права инженера</a>
<a href="{% url 'work_hand_over' %}" class="btn btn-danger btn-block py-3">Сдать права инженера</a>
</div>
</div>
<form class="row g-3 align-items-center" method="post" action="/work/get_tickets">
{% csrf_token %}
<div class="col-2">