From f20038e37bba79ed7f5c82a72ea8218e35893226 Mon Sep 17 00:00:00 2001 From: Camille Chauvet Date: Thu, 16 Feb 2023 15:19:28 +0100 Subject: [PATCH] merge wallah ct chaud --- env.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/env.c b/env.c index 7b9ce5b..cab6ec4 100644 --- a/env.c +++ b/env.c @@ -6,11 +6,7 @@ /* By: erey-bet +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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;