fix merge conflicts

2022-03-06 12:48:31 +00:00
parent 7c16cd6c84 3837b9ae32
commit 618217a80f
36 changed files with 121 additions and 0 deletions
--- a/fet2020/templates/members/index.html
+++ b/fet2020/templates/members/index.html
@@ -50,8 +50,13 @@

                            <hr class="">

+<<<<<<< HEAD
                            <li class="{% if 'pension' in request.path %}active{% endif %}">
                                <a href="{% url 'members_view' 'pension' %}">Pension</a>
+=======
+                            <li class="{% if '/members/P' == request.path %}active{% endif %}">
+                                <a href="{% url 'members_view' 'P' %}">Pension</a>
+>>>>>>> 3837b9ae32918b2a2fef76f460522465c7cf557f
                            </li>

                            <li class="{% if '/members/' == request.path %}active{% endif %}">