42_adjoly/cub3d
Archived
1
0 Fork 0
Code Activity

「🔨」 fix(Merge): fixed merge shit

Browse Source
This commit is contained in:
KeyZox committed 2024-11-06 12:54:03 +01:00
1 parent e5cd68a3e9
commit d99bc18bd0
1 file changed
+1 -5
Download Patch File Download Diff File Expand all files Collapse all files
src/cub3d.c
+1 -5
View File
@@ -6,11 +6,7 @@
/* By: madumerg <madumerg@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 */
/* */
/* ************************************************************************** */