From 0fc1331cb4e576344451ae2151151bd2b36825a3 Mon Sep 17 00:00:00 2001 From: Rudy Bousset Date: Mon, 17 Feb 2020 16:49:57 +0100 Subject: Solved HEAD conflicts --- Makefile | 3 --- 1 file changed, 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c437182..7c86a54 100644 --- a/Makefile +++ b/Makefile @@ -52,11 +52,8 @@ SRCS_NAME += ft_init_s_ray.c SRCS_NAME += ft_init_map.c SRCS_NAME += ft_tex_init.c SRCS_NAME += ft_detect.c -<<<<<<< HEAD SRCS_NAME += ft_check_ext.c -======= SRCS_NAME += ft_draw_textures.c ->>>>>>> 8a89388d397b50f2c70cef05f8fa6cfa10cc213c #--------------------------------------------------------------------------------------------------# SRCS = $(addprefix ${SRCS_DIR},${SRCS_NAME}) #--------------------------------------------------------------------------------------------------# -- cgit v1.2.3