From 4db2c582e2358cc6fd026b46cca5c2e8728d7cd9 Mon Sep 17 00:00:00 2001
From: Andrin Fassbind <fassband@students.zhaw.ch>
Date: Fri, 13 May 2022 23:03:15 +0200
Subject: [PATCH] merge conflict

---
 .../ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java | 3 +--
 .../turnierverwaltung/main/MainWindowController.java         | 5 +----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
index d9a2b85..0c4baac 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
@@ -119,8 +119,7 @@ public class FactoryDecorator implements IsObservable {
      */
     public void openTournamentList() {
         logger.fine("Showing TournamentList view");
-        factory.showTournamentList((BorderPane) pane, this);
-
+        factory.showTournamentList((BorderPane) pane);
         informListener();
     }
 
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 e31c94b..2a9c96c 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
@@ -31,10 +31,7 @@ public class MainWindowController extends FXController {
     @FXML
     private Menu menuItemLanguage;
 
-
-    private static final Logger logger = Logger.getLogger(MainWindowController.class.getCanonicalName());
-
-
+    /**
      * Method changes the language Setting to german
      */
     @FXML