manage conflict

This commit is contained in:
Maoake Teriierooiterai
2026-01-08 13:52:45 +01:00
4 changed files with 92 additions and 6 deletions

View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/12/08 14:18:06 by dgaillet #+# #+# */
/* Updated: 2025/12/15 14:34:45 by dgaillet ### ########lyon.fr */
/* Updated: 2026/01/07 10:30:42 by dgaillet ### ########lyon.fr */
/* */
/* ************************************************************************** */
@@ -66,4 +66,7 @@ int test2(char **argv);
/* TEST FILE */
int test1(int argc, char **argv);
/* RADIX */
void radix(t_stacks *stacks);
#endif