essai branch 1 ***

lib/Pion.py

@@ -10,15 +10,9 @@ from Creature import Creature
 from Forme import Forme
 from outilsSvg import *
 
-<<<<<<< HEAD
 def fctBidon():
     return "salut!!"
 
-=======
-def fctBidon2():
-    return "au revoir!"
->>>>>>> master
-
 class Pion(QGraphicsItem):
     """pion du plateau de combat"""
     def __init__(self, plateau, numero, parent=None):