removed merge conflicts

This commit is contained in:
nawfe 2020-04-29 15:00:04 +02:00
parent 502a9fcc62
commit d3cc6634fb

View File

@ -23,10 +23,11 @@ public class Main extends Application {
primaryStage.setTitle("Shadow Hunters"); primaryStage.setTitle("Shadow Hunters");
primaryStage.setScene(new Scene(root)); primaryStage.setScene(new Scene(root));
primaryStage.centerOnScreen(); primaryStage.centerOnScreen();
primaryStage.setMaximized(true);
primaryStage.show(); primaryStage.show();
} }
public static void main(String[] args) { public static void main(String[] args) {
launch(args); launch(args);
} }
} }