From d5d39e5653a0b8fe1d66551e916f27c96260dce4 Mon Sep 17 00:00:00 2001 From: Jack Halford Date: Wed, 16 Nov 2016 10:58:30 +0100 Subject: [PATCH] merge fix --- libft/includes/libft.h | 6 +----- libft/src/ft_printf/ft_printf.c | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/libft/includes/libft.h b/libft/includes/libft.h index 91e507d6..bbebfb96 100644 --- a/libft/includes/libft.h +++ b/libft/includes/libft.h @@ -6,11 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/07 13:49:04 by jhalford #+# #+# */ -<<<<<<< HEAD -/* Updated: 2016/11/16 10:53:34 by jhalford ### ########.fr */ -======= -/* Updated: 2016/11/14 16:31:04 by jhalford ### ########.fr */ ->>>>>>> a3f7d30e3fc482af179207682b48ae052d422bdf +/* Updated: 2016/11/16 10:58:19 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/libft/src/ft_printf/ft_printf.c b/libft/src/ft_printf/ft_printf.c index 696e7a4f..d58717e0 100644 --- a/libft/src/ft_printf/ft_printf.c +++ b/libft/src/ft_printf/ft_printf.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/07 13:33:27 by jhalford #+# #+# */ -/* Updated: 2016/11/16 10:57:25 by jhalford ### ########.fr */ +/* Updated: 2016/11/16 10:58:04 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */