resolved merge conflicts

1 files changed, 1 insertions, 1 deletions

diff --git a/src/main.c b/src/main.c
index 3672fdd..18530bb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,7 +6,7 @@
 /*   By: chuhlig <chuhlig@student.42.fr>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/22 17:14:03 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/10/25 15:53:10 by chuhlig          ###   ########.fr       */
+/*   Updated: 2024/10/25 16:06:32 by chuhlig          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */