logistic-bot/cub3d
1
0
Fork 0
mirror of https://codeberg.org/ACME-Corporation/cub3d.git synced 2025-12-06 09:58:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Removed git conflict marker

Browse source
This commit is contained in:
Theo Champion 2025-08-18 13:04:13 +02:00
parent 541bc9ccf8
commit ef7a6c27a4
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/sprites/create_sprite.c
View file

@ -6,11 +6,7 @@
/* By: tchampio <tchampio@student.42lehavre.fr> +#+ +:+ +#+ */ /* By: tchampio <tchampio@student.42lehavre.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/08/12 15:43:19 by tchampio #+# #+# */ /* Created: 2025/08/12 15:43:19 by tchampio #+# #+# */
<<<<<<< HEAD /* Updated: 2025/08/18 12:55:21 by tchampio ### ########.fr */
/* Updated: 2025/08/14 21:24:03 by tchampio ### ########.fr */
=======
/* Updated: 2025/08/13 14:53:38 by tchampio ### ########.fr */
>>>>>>> f9c846b (dev: Added sprite types and gave 'base' sprites their types)
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */