bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
Patrick Mayr
2021-05-15 19:39:05 +00:00
parent 0e87c5e4a5
commit cacfc83ff1
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fet2020/templates/layout.html
View File

@@ -55,16 +55,10 @@
{% endif %} {% endif %}
</a> </a>
</li> </li>
<<<<<<< HEAD
<li><a href="/admin" style="background: lightgrey;">Admin</a></li>
<li><a href="{% url 'tasks' %}" style="background: lightgrey;">Tasks</a></li>
<li><a href="{% url 'intern' %}" style="background: lightgrey;">Intern</a></li>
<li><a href="https://legacy.fet.at/home/intern" style="background: lightgrey;">Legacy Intern</a></li>
=======
<li><a class="button header-intern-btn header-intern-link" href="/admin">Admin</a></li> <li><a class="button header-intern-btn header-intern-link" href="/admin">Admin</a></li>
<li><a class="button header-intern-btn header-intern-link" href="{% url 'tasks' %}">Tasks</a></li> <li><a class="button header-intern-btn header-intern-link" href="{% url 'tasks' %}">Tasks</a></li>
<li><a class="button header-intern-btn header-intern-link" href="https://legacy.fet.at/home/intern">Intern</a></li> <li><a class="button header-intern-btn header-intern-link" href="{% url 'intern' %}">Intern</a></li>
>>>>>>> origin/master <li><a class="button header-intern-btn header-intern-link" href="https://legacy.fet.at/home/intern">Legacy Intern</a></li>
{% endif %} {% endif %}
<li><a class="button header-btn header-link" href="{% url 'posts.index' %}">News</a></li> <li><a class="button header-btn header-link" href="{% url 'posts.index' %}">News</a></li>
<!-- show active members first --> <!-- show active members first -->