ajout de commentaires a add_to_list et resolution de conflits pour merge

This commit is contained in:
Hugo LAMY
2019-04-15 16:42:19 +02:00
5 changed files with 120 additions and 53 deletions

View File

@@ -6,7 +6,7 @@
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/01 13:34:46 by vmanzoni #+# #+# */
/* Updated: 2019/04/15 13:39:50 by vmanzoni ### ########.fr */
/* Updated: 2019/04/15 16:23:18 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
@@ -37,7 +37,6 @@ void print_error(char *s);
int check_file_errors(char *file);
int check_tetri_errors(char *tetri);
int check_tetri_errors2(char *tetri);
int add_to_list(char **square);
/*
** STRUCTURE
@@ -53,4 +52,6 @@ typedef struct s_fillist
struct s_fillist *next;
} t_fillist;
int add_to_list(char **square, t_fillist **list);
#endif