blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 20:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

-fixed merge

Browse Source
This commit is contained in:
ma0048
2023-08-08 09:30:05 +02:00
parent 2e103ccdd8
commit d86ef10d45
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vilesci/stammdaten/auswertung_fhtw.php
-4
View File
@@ -3092,11 +3092,7 @@ else
}
if ($rechte->isBerechtigt('infocenter', null, 'suid'))
{
<<<<<<< HEAD
echo '&nbsp;&nbsp;<button type="button" class="btn btn-default btn-xs" onclick="clearList()" id="mailSendButton">Liste aufräumen</button>';
=======
echo '&nbsp;&nbsp;<button type="button" class="btn btn-default btn-xs" onclick="clearList()" id="clearListButton" title="Löscht alle Prüflinge, bei denen keine Daten vorhanden sind">Liste aufräumen</button>';
>>>>>>> master
}
echo '</div></div></form>';
echo ' <form class="form" role="form">