wulkanowy/wulkanowy-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix previous commit

Browse source
This commit is contained in:
Marcin Kowalicki 2021-01-10 22:52:29 +01:00
parent 5901025aee
commit 5ea25d9123
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
templates/content.html
View file

@ -42,7 +42,6 @@
<a href="#name"><span class="white-text name">John Doe</span></a>
<a href="#email"><span class="white-text email">jdandturk@gmail.com</span></a>
</div></li>
<<<<<<< HEAD
<li><a id="grades_">Oceny</a></li>
<li><a id="timetable_">Plan Lekcji</a></li>
<li><a id="exams_">Sprawdziany</a></li>
@ -56,7 +55,6 @@
<li><a href="#!">Usunięte</a></li>
</ul>
<li><a id="notes_">Uwagi</a></li>
=======
<li><a id="grades_" class='option'>Oceny</a></li>
<li><a id="timetable_" class='option'>Plan Lekcji</a></li>
<li><a id="exams_" class='option'>Sprawdziany</a></li>
@ -65,7 +63,6 @@
<li><a id="messages_" class='option'>Wiadomości</a></li>
<li><a id="notes_" class='option'>Uwagi</a></li>
<li><a id="mobile_access_" class='option'>Dostęp Mobilny</a></li>
>>>>>>> b7c706ad482b5705a8aad6e92c31d1bb95d2d735
</ul>
<a href="#" data-target="slide-out" class="sidenav-trigger"><i class="material-icons">menu</i></a>