From 71140976015893dd758aa8986a1a206a49ee59cc Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Fri, 13 May 2022 22:53:49 +0200
Subject: [PATCH] fixed merge problem.

---
 .../projekt2/turnierverwaltung/main/MainWindowController.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java
index 06d9da9..1931fa9 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java
@@ -34,12 +34,12 @@ public class MainWindowController extends FXController {
      * Method changes the language Setting to german
      */
     @FXML
-    void changeLangToGerman(ActionEvent event) {
+    void changeLangToGerman() {
         getLanguageConfigurator().changeLanguage(LanguageConfigurator.Language.GERMAN);
     }
 
     @FXML
-    void changeLangToEnglish(ActionEvent event) {
+    void changeLangToEnglish() {
         getLanguageConfigurator().changeLanguage(LanguageConfigurator.Language.ENGLISH);
     }