playerscontroller

2020-04-23 10:11:41 +02:00
parent 5930322daf
commit 70d6857ab2
6 changed files with 26 additions and 18 deletions
--- a/src/ihm/Main.java
+++ b/src/ihm/Main.java
@@ -10,12 +10,8 @@ import javafx.stage.Stage;
 public class Main extends Application{
 	@Override
    public void start(Stage primaryStage) throws Exception{
-<<<<<<< HEAD
 		System.out.println("Lancement de l'application");
        Parent root = FXMLLoader.load(getClass().getResource("ressources/Menu.fxml"));
-=======
-        Parent root = FXMLLoader.load(getClass().getResource("ressources/Choix_joueur.fxml"));
->>>>>>> 8234d1247461715477e5a73a00bb6c077372e26d
        primaryStage.setTitle("Shadow Hunters");
        primaryStage.setScene(new Scene(root));
        primaryStage.show();