From d99bc18bd031b24b2da82028ad9d95be00694b71 Mon Sep 17 00:00:00 2001 From: Adam JOLY Date: Wed, 6 Nov 2024 12:54:03 +0100 Subject: [PATCH] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix(Merge):=20?= =?UTF-8?q?fixed=20merge=20shit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/cub3d.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/cub3d.c b/src/cub3d.c index f42af4a..3bce937 100644 --- a/src/cub3d.c +++ b/src/cub3d.c @@ -6,11 +6,7 @@ /* By: madumerg +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/09/04 16:58:27 by madumerg #+# #+# */ -<<<<<<< HEAD -/* Updated: 2024/10/05 19:18:00 by madumerg ### ########.fr */ -======= -/* Updated: 2024/11/06 11:50:38 by adjoly ### ########.fr */ ->>>>>>> raycasting +/* Updated: 2024/11/06 12:53:52 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */