mirror of
https://github.com/DavidGailleton/42-Push_Swap.git
synced 2026-01-27 08:41:58 +00:00
fix conflict
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
/* By: mteriier <mteriier@student.42lyon.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2026/01/07 13:05:52 by mteriier #+# #+# */
|
||||
/* Updated: 2026/01/07 13:05:53 by mteriier ### ########lyon.fr */
|
||||
/* Updated: 2026/01/08 15:32:54 by dgaillet ### ########lyon.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@@ -22,4 +22,6 @@ int pos_bench(char **argv, int mod);
|
||||
int pos_flag(char **argv, int mod);
|
||||
int calcul_mod(int argc, char **argv);
|
||||
|
||||
void print_bench(t_stacks *stacks);
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user