Modification

birdie.py

@@ -14,35 +14,8 @@ def update():
 def draw():
     screen.blit('background', (0, 0))
     titi.draw()
-<<<<<<< HEAD
-    #ghost.draw()
-
- def on_mouse_down():
-     print("plus vite)")
-        titi.speed +=1
-#     print('stop !')
-#     titi.y -= 20
-#     ghost.x -= 10
-#     titi.speed = 0
-#     ghost.speed = 0
-
-# def on_mouse_up():
-#     print('go')
-#     titi.speed = 5
-#     ghost.speed = 4
-
-
-def update():
-    titi.x +=  titi.speed
-    #ghost.y += ghost.speed
-
-titi.speed = 5
-#ghost.speed = 4
-
-=======
 
 titi = Actor('bird1', (75, 350))
 titi.speed = 1
->>>>>>> 305580eea7190f860f95c5a693da9fcb58fadf6a
 
 pgzrun.go()