Traducion

2020-04-30 13:09:18 +02:00
parent d4a52236e1
commit 255e8012bf
7 changed files with 28 additions and 14 deletions
--- a/src/ihm/controller/PlateauController.java
+++ b/src/ihm/controller/PlateauController.java
@@ -27,10 +27,6 @@ import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
-<<<<<<< HEAD
-=======
-import javafx.util.Duration;
->>>>>>> eea99d2341b1df015a2831034aa39534addff16e
 import main.Joueur;
 import main.View;