correction du conflit

stack.c

-<<<<<<< HEAD
 #include <stdio.h>
 #include "stack.h"
 
@@ -7,6 +6,3 @@ void peek(stack s, int *value){
         *value=s.data[s.top];
     }
 }
-=======
-#include "stack.h"
->>>>>>> main