merging conflict

2021-11-18 21:33:47 +01:00
parent 0b6d8cf127 7c65dcd897
commit ef12d6ba4b
12 changed files with 404 additions and 8 deletions
--- a/srcs/parsing/expansions/new_token_for_each_field.c
+++ b/srcs/parsing/expansions/new_token_for_each_field.c
@@ -56,7 +56,7 @@ static t_token	*insert_tokens(t_token *t, t_token *insert_lst)

 	t->id = 0;
 	free(t->content);
-	t->content = NULL;
+	t->content = NULL; // TODO : free_null()
 	if (!insert_lst)
 		return (t);