From 51295179f30451f2c2d6cbc8653c5accd9fb8a8a Mon Sep 17 00:00:00 2001
From: Tanguy MAZE <tmaze@student.42.fr>
Date: Wed, 27 Mar 2019 17:50:46 +0100
Subject: [PATCH] oopsie =S

cleaned merge message
---
 Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index e3c97d4..337abf0 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 #    By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2018/04/07 12:47:06 by tmaze             #+#    #+#              #
-#    Updated: 2019/03/23 17:18:32 by tmaze            ###   ########.fr        #
+#    Updated: 2019/03/27 17:46:28 by tmaze            ###   ########.fr        #
 #                                                                              #
 #******************************************************************************#
 
@@ -16,7 +16,6 @@ CCSTD =
 
 NAME = libft.a
 
-<<<<<<< HEAD
 SRCS =	ft_memalloc.c	\
 		ft_memdel.c 	\
 		ft_memset.c		\