resolution conflit

TP5/minesweeper/cell.py

@@ -112,8 +112,10 @@ class Cell:
             if self.is_bomb:
                 return'B'
             else:
-                return str(self.nbombs_in_neighborhood)
-       
+                if self.nbombs_in_neighborhood:
+                    return '1'
+                else:
+                    return '0'
         else:
             return' '
              

TP6/associations/dicotrie.py

@@ -73,17 +73,7 @@ class DicoTrie:
         $$$ d1
         DicoTrie([Association("a", 1), Association("b", 2), Association("c", 3)])
         """
-#         res=[]
-#         for elt in self:
-#             res.append(self.liste_assos)
-#             
-#         res.add(self.cle,self.valeur)
-#         
-#         return res
-
-        self.liste_assos[cle]=valeur
-            
-        
+        self.liste_assos[cle]=valeur          
         
         
     def __getitem__(self, cle: C) -> V:
@@ -96,7 +86,12 @@ class DicoTrie:
         $$e d1['c']
         KeyError
         """
+<<<<<<< HEAD
         self.liste_assos[cle]
+=======
+        return self.liste_assos[cle]
+        
+>>>>>>> fca09ee4d9aa6d43a18b3f54109c30cc7e3cac49
 
     def __delitem__(self, cle: C) -> NoneType:
         """ 
@@ -107,10 +102,14 @@ class DicoTrie:
         $$e del d1['c'] 
         KeyError 
         """
+<<<<<<< HEAD
         
         
         
         
+=======
+        del self.liste_assos[cle]
+>>>>>>> fca09ee4d9aa6d43a18b3f54109c30cc7e3cac49
 
     def __contains__(self, cle: C) -> bool:
         """ 
@@ -126,6 +125,8 @@ class DicoTrie:
 #             if cle==x:
 #                 return True
 
+      
+
 if __name__ == '__main__':
     import apl1test
     apl1test.testmod('dicotrie.py')