「🗑️」 clean: Cleaned merge rest

include/minishell.h

@@ -6,11 +6,8 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/26 09:38:51 by mmoussou          #+#    #+#             */
-<<<<<<< HEAD
 /*   Updated: 2024/05/06 20:30:42 by mmoussou         ###   ########.fr       */
-=======
 /*   Updated: 2024/05/03 10:24:15 by adjoly           ###   ########.fr       */
->>>>>>> e1ba625 (「🏗️」 wip: testing things, might broke.)
 /*                                                                            */
 /* ************************************************************************** */
 

include/minishell.h.orig

@@ -1,35 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   minishell.h                                        :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2024/04/26 09:38:51 by mmoussou          #+#    #+#             */
-<<<<<<< HEAD
-/*   Updated: 2024/05/06 20:30:42 by mmoussou         ###   ########.fr       */
-=======
-/*   Updated: 2024/05/03 10:24:15 by adjoly           ###   ########.fr       */
->>>>>>> e1ba625 (「🏗️」 wip: testing things, might broke.)
-/*                                                                            */
-/* ************************************************************************** */
-
-#ifndef MINISHELL_H
-# define MINISHELL_H
-
-# include <readline/readline.h>
-# include <stdio.h>
-# include <stdlib.h>
-# include <stdint.h>
-# include "libft.h"
-
-# include "parsing.h"
-# include "execution.h"
-
-char	set_env(char **env, const char *name, char *content);
-char	*get_hostname(void);
-char	*get_prompt(void);
-char	*get_pwd(void);
-bool	is_str(char *src, char *dst);
-
-#endif