From ec3d1f08c497bb787cd41badafa5bb53d1158a6f Mon Sep 17 00:00:00 2001
From: "narindra.rajohnso" <narindra-hasimanjaka-david.rajohnson@etu.hesge.ch>
Date: Thu, 25 Nov 2021 20:33:16 +0100
Subject: [PATCH] correction du conflit

---
 stack.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/stack.c b/stack.c
index d682164..00282e3 100644
--- a/stack.c
+++ b/stack.c
@@ -1,4 +1,3 @@
-<<<<<<< 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
-- 
GitLab