From d3cc6634fbbd1aa44289f5aca442f3972ffd9293 Mon Sep 17 00:00:00 2001
From: nawfe <nawfelhilal13@gmail.com>
Date: Wed, 29 Apr 2020 15:00:04 +0200
Subject: [PATCH] removed merge conflicts

---
 src/ihm/Main.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ihm/Main.java b/src/ihm/Main.java
index f8fd0b7..d3f8328 100644
--- a/src/ihm/Main.java
+++ b/src/ihm/Main.java
@@ -23,10 +23,11 @@ public class Main extends Application {
 		primaryStage.setTitle("Shadow Hunters");
 		primaryStage.setScene(new Scene(root));
 		primaryStage.centerOnScreen();
+		primaryStage.setMaximized(true);
 		primaryStage.show();
 	}
 
 	public static void main(String[] args) {
 		launch(args);
 	}
-}
+}
\ No newline at end of file