From 6c29b493e1f6f61edd8a010ca83d59725a4fec03 Mon Sep 17 00:00:00 2001 From: Jack Halford Date: Fri, 24 Mar 2017 18:25:52 +0100 Subject: [PATCH] ca compile --- 42sh/src/exec/redirect_great.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/42sh/src/exec/redirect_great.c b/42sh/src/exec/redirect_great.c index ed4cca69..5c39be5e 100644 --- a/42sh/src/exec/redirect_great.c +++ b/42sh/src/exec/redirect_great.c @@ -6,11 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/06 22:03:53 by jhalford #+# #+# */ -<<<<<<< HEAD -/* Updated: 2017/03/24 16:58:17 by jhalford ### ########.fr */ -======= -/* Updated: 2017/03/24 17:22:28 by gwojda ### ########.fr */ ->>>>>>> db98f2f1bcbfc8738908b02fd327e30e18e37f88 +/* Updated: 2017/03/24 18:25:41 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */