From ffe28ea8fb2e997e4e118f8c8700b206ec18728a Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 27 Nov 2024 14:58:00 +0100
Subject: [PATCH] undo phrases changes to avoid merging conflict

---
 system/phrasesupdate.php | 65 ----------------------------------------
 1 file changed, 65 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index d53cc54aa..21d27dcf8 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -9031,50 +9031,6 @@ Question(s) to open the examination interview
 Reasons for failing OR any possible explanatory notes on a passing grade
 << Please fill out >>
 
-Any unusual occurrences
-<< Please fill out >>',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'core',
-		'category' => 'ui',
-		'phrase' => 'pruefungsnotizenBachelor2',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Prüfungsteil/e in Englisch (Optional - entsprechend der Vorgabe des Studiengangs):
-<< Nichtzutreffendes löschen >>
-* Präsentation der Bachelorarbeit
-* Prüfungsgespräch über die Bachelorarbeit
-
-Fragen zur Eröffnung des Prüfungsgesprächs
-<< Bitte ausfüllen >>
-
-Gründe für negative Beurteilung ODER allfällige Anmerkungen bei positiver Beurteilung
-<< Bitte ausfüllen >>
-
-Allfällige besondere Vorkommnisse
-<< Bitte ausfüllen >>',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Parts of the examination held in English (Optional - in line with the degree program\'s guidelines):
-<< Delete as appropriate >>
-* Presentation of the Bachelor Paper
-* Examination interview on the Bachelor Paper
-
-Question(s) to open the examination interview
-<< Please fill out >>
-
-Reasons for failing OR any possible explanatory notes on a passing grade
-<< Please fill out >>
-
 Any unusual occurrences
 << Please fill out >>',
 				'description' => '',
@@ -31210,27 +31166,6 @@ array(
 			)
 		)
 	),
-	array(
-		'app' => 'core',
-		'category' => 'stv',
-		'phrase' => 'tab_finalexam',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Abschlussprüfung',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Final exam',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-
 );