Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/Language.java
This commit is contained in:
Andrin Fassbind 2021-10-15 08:34:44 +02:00
commit e52e0e23cf
1 changed files with 1 additions and 1 deletions

View File

@ -52,7 +52,7 @@ public class Language {
return true; return true;
} }
System.out.println(checkLanguage( System.out.println(checkLanguage(
"Diese Sprache ist nicht zulässig.", "Diese Sprache ist nicht zulässig",
"This Language is not valid", "This Language is not valid",
"Ngôn ngữ này không được phép")); "Ngôn ngữ này không được phép"));
return false; return false;