merge conflict

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();
     }
 

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