From 9c710c13e36c597cb17e2df531c605ba05100477 Mon Sep 17 00:00:00 2001 From: Theo Champion Date: Tue, 29 Jul 2025 13:33:04 +0200 Subject: [PATCH] fix: removed stash conflict --- src/consts.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/consts.h b/src/consts.h index 7f61e8d..59fd961 100644 --- a/src/consts.h +++ b/src/consts.h @@ -6,11 +6,7 @@ /* By: kcolin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/07/17 14:54:36 by kcolin #+# #+# */ -<<<<<<< Updated upstream -/* Updated: 2025/07/29 11:42:20 by kcolin ### ########.fr */ -======= -/* Updated: 2025/07/29 12:02:08 by tchampio ### ########.fr */ ->>>>>>> Stashed changes +/* Updated: 2025/07/29 13:29:11 by tchampio ### ########.fr */ /* */ /* ************************************************************************** */