removed merch conflict

diff --cc src/tokenizer.c
index dfdffe1416486b4b13ba1c81557613d9ebe1fc93,ab8a6ac2907daaa5b36ea256ec0706c77a00771b..d7a96f7346b336b8f044bac0468b80b4e5212df3
--- 1/src/tokenizer.c
--- 2/src/tokenizer.c
+++ b/src/tokenizer.c
@@@ -6,7 -6,7 +6,7 @@@
  /*   By: chuhlig <chuhlig@student.42.fr>            +#+  +:+       +#+        */
  /*                                                +#+#+#+#+#+   +#+           */
  /*   Created: 2024/06/28 20:55:50 by chuhlig           #+#    #+#             */
- /*   Updated: 2024/08/29 15:01:48 by chuhlig          ###   ########.fr       */
 -/*   Updated: 2024/08/29 15:26:55 by dkaiser          ###   ########.fr       */
++/*   Updated: 2024/10/17 14:21:26 by chuhlig          ###   ########.fr       */
  /*                                                                            */
  /* ************************************************************************** */