merge wallah ct chaud
This commit is contained in:
parent
edbd267c0d
commit
f20038e37b
9
env.c
9
env.c
@ -6,11 +6,7 @@
|
||||
/* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2023/02/02 14:39:56 by erey-bet #+# #+# */
|
||||
<<<<<<< HEAD
|
||||
/* Updated: 2023/02/16 15:13:35 by cchauvet ### ########.fr */
|
||||
=======
|
||||
/* Updated: 2023/02/16 14:30:12 by erey-bet ### ########.fr */
|
||||
>>>>>>> origin/master
|
||||
/* Updated: 2023/02/16 15:18:48 by cchauvet ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@ -110,7 +106,6 @@ char *get_value(char *str)
|
||||
return (s);
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
void env_del(void *ptr)
|
||||
{
|
||||
t_env *content;
|
||||
@ -120,8 +115,6 @@ void env_del(void *ptr)
|
||||
free(content->value);
|
||||
}
|
||||
|
||||
=======
|
||||
>>>>>>> origin/master
|
||||
char *get_key(char *str)
|
||||
{
|
||||
char *s;
|
||||
|
Loading…
Reference in New Issue
Block a user