mise à niveau

2023-12-10 23:17:09 +01:00
parent 47ec4b937b
commit 5196328975
2 changed files with 0 additions and 3 deletions
--- a/snake/fenetre.c
+++ b/snake/fenetre.c
@@ -16,10 +16,7 @@ int start (void)  {
  int** tableau = plateau_init();

  int i, j;
-<<<<<<< HEAD

-=======
->>>>>>> f209244 (mise à jour)
  
  char* texte1 = "espace = lancer";
  
--- a/snake/lancement
+++ b/snake/lancement