ajout des commentaires.

.vscode/settings.json

@@ -1,5 +0,0 @@
-{
-    "files.associations": {
-        "unistd.h": "c"
-    }
-}

pendu.c

@@ -37,6 +37,7 @@ void display_hangman(int tries) {
     }
 }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 /*
 this function allow to save the last party
@@ -82,6 +83,15 @@ void sig_handler(int signum){
     printf("\ntime out\n");
     exit (1);
 >>>>>>> b4f25a5 (ajout du cooldown sur le scanf)
+=======
+/* this function display time out when user does nothing during 30s and verify signal*/
+void sig_handler(int signum){
+    if (signum == SIGALRM){
+
+        printf("\ntime out\n");
+        exit (1);
+    }
+>>>>>>> 83066e1 (ajout des commentaires.)
 }
 
 int main() {