Merge branch 'master' of git.unistra.fr:yocj/G4b

src/main/View.java

@@ -6,11 +6,13 @@ import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
-<<<<<<< HEAD
 import java.util.ArrayList;
-=======
 import java.util.Collection;
->>>>>>> 4565d047e68340e51e6dd5acc846b32c4ac84cdc
+
+import java.util.ArrayList;
+
+import java.util.Collection;
+
 
 public class View extends JFrame {