fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix merge

Browse Source
This commit is contained in:
Sarah Vaupel 2020-02-04 10:40:34 +01:00
parent 6f2b58c002
commit d19cca6a40
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
messages/uniworx/de-de-formal.msg
View File

@ -1272,11 +1272,8 @@ BreadcrumbExternalExamGrades: Prüfungsleistungen
BreadcrumbExternalExamStaffInvite: Einladung zum Prüfer
BreadcrumbParticipantsList: Kursteilnehmerlisten
BreadcrumbParticipants: Kursteilnehmerliste
<<<<<<< HEAD
BreadcrumbStorageKey: Lokalen Schlüssel generieren
=======
BreadcrumbExamAutoOccurrence: Automatische Termin-/Raumverteilung
>>>>>>> master
ExternalExamEdit coursen@CourseName examn@ExamName: Bearbeiten: #{coursen}, #{examn}
ExternalExamGrades coursen@CourseName examn@ExamName: Prüfungsleistungen: #{coursen}, #{examn}