starnakin/42_minishell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge wallah ct chaud

Browse Source
This commit is contained in:
Camille Chauvet 2023-02-16 15:19:28 +01:00
parent edbd267c0d
commit f20038e37b
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
env.c
View File

@ -6,11 +6,7 @@
/* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */ /* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/02/02 14:39:56 by erey-bet #+# #+# */ /* Created: 2023/02/02 14:39:56 by erey-bet #+# #+# */
<<<<<<< HEAD /* Updated: 2023/02/16 15:18:48 by cchauvet ### ########.fr */
/* Updated: 2023/02/16 15:13:35 by cchauvet ### ########.fr */
=======
/* Updated: 2023/02/16 14:30:12 by erey-bet ### ########.fr */
>>>>>>> origin/master
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -110,7 +106,6 @@ char *get_value(char *str)
return (s); return (s);
} }
<<<<<<< HEAD
void env_del(void *ptr) void env_del(void *ptr)
{ {
t_env *content; t_env *content;
@ -120,8 +115,6 @@ void env_del(void *ptr)
free(content->value); free(content->value);
} }
=======
>>>>>>> origin/master
char *get_key(char *str) char *get_key(char *str)
{ {
char *s; char *s;