working on cd

2024-02-16 21:53:49 +01:00
parent 2a2ef1d63c
commit e0021ed8ce
4 changed files with 43 additions and 10 deletions
--- a/main.c
+++ b/main.c
@ -6,11 +6,7 @@
 /*   By: marde-vr <marde-vr@42angouleme.fr>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/02/02 21:59:20 by tomoron           #+#    #+#             */
-<<<<<<< HEAD
-/*   Updated: 2024/02/16 16:37:13 by tomoron          ###   ########.fr       */
-=======
-/*   Updated: 2024/02/16 18:21:27 by marde-vr         ###   ########.fr       */
->>>>>>> ad1de58fb2aacb8a3b1b7ef5d74fc6d87f4550b2
+/*   Updated: 2024/02/16 21:30:50 by marde-vr         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */