From 1c2426aad5bdd8b368a8810ed88e1dfbd07f4835 Mon Sep 17 00:00:00 2001 From: nawfe Date: Wed, 29 Apr 2020 16:45:17 +0200 Subject: [PATCH] removed merge conflicts --- src/ihm/Main.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ihm/Main.java b/src/ihm/Main.java index d3f8328..fd95c5e 100644 --- a/src/ihm/Main.java +++ b/src/ihm/Main.java @@ -13,9 +13,9 @@ import javafx.stage.Stage; public class Main extends Application { @Override public void start(Stage primaryStage) throws Exception { - System.out.println("Lancement de l'application"); + System.out.println("Lancement de l'application"); - final URL fxmlURL = getClass().getResource("ressources/parametre.fxml"); // "ressources/Jouer_tour(1)lancer_des.fxml" + final URL fxmlURL = getClass().getResource("ressources/parametre.fxml"); // "ressources/Jouer_tour(1)lancer_des.fxml" final ResourceBundle bundle = ResourceBundle.getBundle("domaine.properties.langue", Locale.ENGLISH); final FXMLLoader fxmlLoader = new FXMLLoader(fxmlURL, bundle); Pane root = fxmlLoader.load();