From 9c512a4b7d05336ba05b1d0bfd907458c8cde3ac Mon Sep 17 00:00:00 2001 From: wrightkhlebisol <calebogundiya@gmail.com> Date: Wed, 26 Jul 2023 09:28:22 +0100 Subject: [PATCH] fix conflict --- main.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/main.c b/main.c index ad59df2..99b3f2b 100644 --- a/main.c +++ b/main.c @@ -123,11 +123,7 @@ int is_builtin_cmd(char *cmd) /** * exec_builtin_cmd - execute builtin commands * @argv: argument vector - points to arguments entered -<<<<<<< HEAD - * @head: head node -======= * @head: head of lists. ->>>>>>> e0ec559d5998b75685d75ab581a10646aac9bbfd * * Return: void */ @@ -247,14 +243,9 @@ void init_env_list(envstruct *head) { char *key = strtok(*environ, "="), *val = strtok(NULL, "="); head = insert_end(head, key, val); -<<<<<<< HEAD *environ++; -======= - i++; ->>>>>>> e0ec559d5998b75685d75ab581a10646aac9bbfd } - } /**