tvdu29/libft
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oopsie =S

Browse Source 
cleaned merge message
This commit is contained in:
Tanguy MAZE 2019-03-27 17:50:46 +01:00
parent 05a6363b5d
commit 51295179f3
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -6,7 +6,7 @@
# By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ # # By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2018/04/07 12:47:06 by tmaze #+# #+# # # 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 NAME = libft.a
<<<<<<< HEAD
SRCS = ft_memalloc.c \ SRCS = ft_memalloc.c \
ft_memdel.c \ ft_memdel.c \
ft_memset.c \ ft_memset.c \