From 7d331ee7da0b1b4a4080b15be15a7306e26e5731 Mon Sep 17 00:00:00 2001
From: Chiara <chiara.relevat@oulook.fr>
Date: Wed, 6 May 2020 15:33:23 +0200
Subject: [PATCH] correction merge main

---
 src/ihm/Main.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/ihm/Main.java b/src/ihm/Main.java
index 5d4795b..6f9f30e 100644
--- a/src/ihm/Main.java
+++ b/src/ihm/Main.java
@@ -16,12 +16,7 @@ import main.GestionnaireJeu;
 public class Main extends Application {
 	@Override
 	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"); 
->>>>>>> 13ae661b3bfcbefc0024fd7828af03782c9a2e66
+		final URL fxmlURL = getClass().getResource("ressources/Menu.fxml");
 	    final ResourceBundle bundle = ResourceBundle.getBundle("domaine.properties.langue", Locale.FRANCE);
 	    final FXMLLoader fxmlLoader = new FXMLLoader(fxmlURL, bundle);
 	    Pane root = fxmlLoader.load();