removed merch conflict

1 files changed, 12 insertions, 11 deletions

diff --git a/include/env.h b/include/env.h
index 1ea6f2e..f3d3c75 100644
--- a/include/env.h
+++ b/include/env.h
@@ -6,18 +6,19 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/08 16:53:39 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/08/08 17:05:11 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/09/13 16:26:16 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-typedef struct s_env {
-    char *name;
-    char *value;
-    struct s_env *next;
-} t_env;
+typedef struct s_env
+{
+	char			*name;
+	char			*value;
+	struct s_env	*next;
+}					t_env;
 
-char *env_get(t_env *env, char *name);
-void env_export(t_env *env, char *name, char *value);
-void env_unset(t_env *env, char *name);
-char **env_to_strlst(t_env *env);
-t_env **env_from_strlst(char **lst);
+char				*env_get(t_env *env, char *name);
+void				env_export(t_env *env, char *name, char *value);
+void				env_unset(t_env *env, char *name);
+char				**env_to_strlst(t_env *env);
+t_env				**env_from_strlst(char **lst);