From: Dominik Kaiser <dkaiser@student.42heilbronn.de>
Date: Tue, 14 Jan 2025 15:40:30 +0000 (+0100)
Subject: Merge branch 'main' into echo-builtint
X-Git-Url: https://git.dkaiser.de/?a=commitdiff_plain;h=398b0d39cbbe2cdabbfae00f799181a37754d5c1;p=42%2Fminishell.git

Merge branch 'main' into echo-builtint
---

398b0d39cbbe2cdabbfae00f799181a37754d5c1
diff --cc src/main.c
index 596b611,18530bb..4e1d9da
--- a/src/main.c
+++ b/src/main.c
@@@ -6,7 -6,7 +6,8 @@@
  /*   By: chuhlig <chuhlig@student.42.fr>            +#+  +:+       +#+        */
  /*                                                +#+#+#+#+#+   +#+           */
  /*   Created: 2024/06/22 17:14:03 by dkaiser           #+#    #+#             */
 +/*   Updated: 2024/08/26 19:55:57 by chuhlig          ###   ########.fr       */
+ /*   Updated: 2024/10/25 16:06:32 by chuhlig          ###   ########.fr       */
  /*                                                                            */
  /* ************************************************************************** */