merge conflict

This commit is contained in:
Andrin Fassbind committed 2022-05-13 23:03:15 +02:00
1 parent 4392fabc38
commit 4db2c582e2
2 files changed
+2 -6

No files matched your search

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