Update UML

.idea/workspace.xml

@@ -51,22 +51,6 @@
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
   </component>
-<<<<<<< HEAD
-=======
-  <component name="RunManager">
-    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="TEST_OBJECT" value="class" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-  </component>
->>>>>>> 6d31939b81f5990cc5cace5080a39400beeac500
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
@@ -81,16 +65,10 @@
       <workItem from="1606917997099" duration="113000" />
       <workItem from="1606918163106" duration="94000" />
       <workItem from="1607006873797" duration="2810000" />
-<<<<<<< HEAD
       <workItem from="1607010556720" duration="2711000" />
-=======
-<<<<<<< HEAD
       <workItem from="1607010556720" duration="433000" />
       <workItem from="1607011298687" duration="1892000" />
-=======
       <workItem from="1607010556720" duration="2636000" />
->>>>>>> b193f618cf69a2db8a4c13db177d4e82a050fcd3
->>>>>>> 6d31939b81f5990cc5cace5080a39400beeac500
     </task>
     <servers />
   </component>

src/puissance4/model/Case.java

@@ -5,6 +5,7 @@ public class Case {
     private int posLigne;
     private int posColonne;
 
+
     public Case(){
 
     }

src/puissance4/model/Grille.java

 package puissance4.model;
 
-import java.lang.reflect.Array;
 import java.util.Arrays;
 
 public class Grille
@@ -8,7 +7,7 @@ public class Grille
     private final int nbCases;
     private int nblignes;
     private int nbColonnes;
-    private int[][] grille;
+    public int[][] grille;
 
     public Grille ()
     {