Skip to content
Snippets Groups Projects
Commit ec3d1f08 authored by narindra.rajohnso's avatar narindra.rajohnso
Browse files

correction du conflit

parent 33be7390
No related branches found
No related tags found
1 merge request!5Resolve "Add peek function"
This commit is part of merge request !5. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 4 deletions
stack.c
+ 0
− 4
View file @ ec3d1f08
<<<<<<< HEAD
#include <stdio.h> #include <stdio.h>
#include "stack.h" #include "stack.h"
...@@ -7,6 +6,3 @@ void peek(stack s, int *value){ ...@@ -7,6 +6,3 @@ void peek(stack s, int *value){
*value=s.data[s.top]; *value=s.data[s.top];
} }
} }
=======
#include "stack.h"
>>>>>>> main
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment