School-DUT-info/M431-ShadowHunterGame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correction merge main

Browse Source
This commit is contained in:
Chiara 2020-05-06 15:33:23 +02:00
parent 2edaa6156e
commit 7d331ee7da
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ihm/Main.java
View File

@ -16,12 +16,7 @@ import main.GestionnaireJeu;
public class Main extends Application { public class Main extends Application {
@Override @Override
public void start(Stage primaryStage) throws Exception { public void start(Stage primaryStage) throws Exception {
<<<<<<< HEAD
final URL fxmlURL = getClass().getResource("ressources/Jouer_tour(2c2)choisir_joueur.fxml"); // "ressources/Jouer_tour(1)lancer_des.fxml"
=======
final URL fxmlURL = getClass().getResource("ressources/Menu.fxml"); final URL fxmlURL = getClass().getResource("ressources/Menu.fxml");
>>>>>>> 13ae661b3bfcbefc0024fd7828af03782c9a2e66
final ResourceBundle bundle = ResourceBundle.getBundle("domaine.properties.langue", Locale.FRANCE); final ResourceBundle bundle = ResourceBundle.getBundle("domaine.properties.langue", Locale.FRANCE);
final FXMLLoader fxmlLoader = new FXMLLoader(fxmlURL, bundle); final FXMLLoader fxmlLoader = new FXMLLoader(fxmlURL, bundle);
Pane root = fxmlLoader.load(); Pane root = fxmlLoader.load();