Skip to content
Snippets Groups Projects
Commit 553fe5fe authored by Almohamed Alsadou Fatima's avatar Almohamed Alsadou Fatima
Browse files

resolution conflit

parent b2592d44
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
TP6/associations/dicotrie.py
+ 0
− 12
View file @ 553fe5fe
...@@ -86,12 +86,7 @@ class DicoTrie: ...@@ -86,12 +86,7 @@ class DicoTrie:
$$e d1['c'] $$e d1['c']
KeyError KeyError
""" """
<<<<<<< HEAD
self.liste_assos[cle]
=======
return self.liste_assos[cle] return self.liste_assos[cle]
>>>>>>> fca09ee4d9aa6d43a18b3f54109c30cc7e3cac49
def __delitem__(self, cle: C) -> NoneType: def __delitem__(self, cle: C) -> NoneType:
""" """
...@@ -102,14 +97,7 @@ class DicoTrie: ...@@ -102,14 +97,7 @@ class DicoTrie:
$$e del d1['c'] $$e del d1['c']
KeyError KeyError
""" """
<<<<<<< HEAD
=======
del self.liste_assos[cle] del self.liste_assos[cle]
>>>>>>> fca09ee4d9aa6d43a18b3f54109c30cc7e3cac49
def __contains__(self, cle: C) -> bool: def __contains__(self, cle: C) -> bool:
""" """
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment