diff options
Diffstat (limited to '')
| -rw-r--r-- | inc/cub3d.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/inc/cub3d.h b/inc/cub3d.h index a6131b7..09ea32e 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -82,10 +82,7 @@ int ft_key_loop(t_cub *cl); void ft_draw_circle(int32_t a, int32_t b, int32_t color, t_cub *cl); void ft_draw_texture(t_cub *cl, int x, int y, int tex_y); -<<<<<<< HEAD int8_t ft_check_not_found(const char *path); -======= void ft_calc_tex(t_cub *clist); ->>>>>>> textures_fix # endif |