merge conflicts

This commit is contained in:
hugogogo
2021-12-10 10:29:45 +01:00
31 changed files with 470 additions and 139 deletions

View File

@@ -6,7 +6,7 @@
/* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2021/10/24 10:52:40 by lperrey #+# #+# */
/* Updated: 2021/12/05 14:02:10 by hulamy ### ########.fr */
/* Updated: 2021/12/10 10:26:31 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
@@ -78,7 +78,7 @@ t_cmd **parsing(t_token *token_list)
// Struct CMD fill
if (!pipeline_fill_argv(token_list, pipeline))
return (ft_retp_free(NULL, &pipeline, (t_free_f)free_pipeline));
// print_pipeline(pipeline);
//print_pipeline(pipeline);
return (pipeline);
}