Compare commits

..

No commits in common. "9ace235831188c2b41234605d2c1ba1dd1b920a9" and "76bc8fbfd8d5413e8f6e4f3eb6ec00db0fa3c884" have entirely different histories.

View File

@ -6,19 +6,7 @@
/* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/02/17 13:09:08 by erey-bet #+# #+# */
<<<<<<< HEAD
<<<<<<< HEAD
/* Updated: 2023/02/21 22:24:51 by erey-bet ### ########.fr */
=======
<<<<<<< HEAD
/* Updated: 2023/02/21 21:45:38 by cchauvet ### ########.fr */
=======
/* Updated: 2023/02/21 22:09:55 by erey-bet ### ########.fr */
>>>>>>> 1fdc51a668e616de94c33d5b3b1e9cb51182916d
>>>>>>> eb4a8ed663b2f93cd955f7608aa686bd8e767a65
=======
/* Updated: 2023/02/21 22:15:27 by cchauvet ### ########.fr */
>>>>>>> 76bc8fbfd8d5413e8f6e4f3eb6ec00db0fa3c884
/* */
/* ************************************************************************** */
@ -75,8 +63,7 @@ char *conca(char **strs)
while (strs[++i] != NULL)
{
ft_strlcat(str, strs[i], ft_strlen(str) + ft_strlen(strs[i]) + 2);
if (strs[i + 1] != NULL)
str[ft_strlen(str)] = ' ';
str[ft_strlen(str)] = ' ';
}
str[ft_strlen(str)] = '\0';
return (str);