fix merge conflicts again........

2022-03-06 12:51:39 +00:00
parent 618217a80f
commit 5bcef5b807
11 changed files with 0 additions and 97 deletions
--- a/fet2020/templates/members/index.html
+++ b/fet2020/templates/members/index.html
@@ -50,13 +50,8 @@

                            <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 %}">