oopsie =S
cleaned merge message
This commit is contained in:
parent
05a6363b5d
commit
51295179f3
3
Makefile
3
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 \
|
||||
|
Loading…
x
Reference in New Issue
Block a user