fix conflict

This commit is contained in:
Maoake Teriierooiterai
2026-01-08 15:07:55 +01:00
12 changed files with 140 additions and 24 deletions

View File

@@ -6,7 +6,7 @@
/* By: mteriier <mteriier@student.42lyon.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2026/01/07 08:03:08 by mteriier #+# #+# */
/* Updated: 2026/01/07 08:03:10 by mteriier ### ########lyon.fr */
/* Updated: 2026/01/08 12:56:19 by dgaillet ### ########lyon.fr */
/* */
/* ************************************************************************** */
@@ -23,5 +23,7 @@ size_t ft_strlen(const char *s);
char *ft_substr(char const *s, unsigned int start, size_t len);
char **ft_split(char const *s, char c);
void free_tab(char **tab);
int checker(int argc, char **argv);
int len_split(char **tab);
#endif