removed merge conflicts

2020-04-29 15:00:04 +02:00
parent 502a9fcc62
commit d3cc6634fb
1 changed files with 2 additions and 1 deletions
--- a/src/ihm/Main.java
+++ b/src/ihm/Main.java
@ -23,6 +23,7 @@ public class Main extends Application {
 		primaryStage.setTitle("Shadow Hunters");
 		primaryStage.setScene(new Scene(root));
 		primaryStage.centerOnScreen();
+		primaryStage.setMaximized(true);
 		primaryStage.show();
 	}