Remove all left over *.orig files

diff --git a/src/builtins/echo.c.orig b/src/builtins/echo.c.orig
deleted file mode 100644 (file)
index ff156ce..0000000
--- a/src/builtins/echo.c.orig
+++ /dev/null
@@ -1,42 +0,0 @@
-#include <stdio.h>
-#include "minishell.h"
-#include "execution.h"
-#include <unistd.h>
-
-int    ft_check_n(char *str)
-{
-       if (str && str[0] == '-' && str[1] == 'n')
-               return (1);
-       return (0);
-}
-
-int    echo(int argc, char **argv)
-{
-<<<<<<< HEAD
-       int i = 1;
-       int flag = 0;
-=======
-       int i;
-       int flag;
->>>>>>> a85a660 (Fix the return value of the builtins)
-       int t;
-
-       i = 1;
-       flag = 0;
-       t = ft_check_n(argv[1]);
-       if (t == 1)
-       {
-               flag = 1;
-               ++i;
-       }
-       while (i < argc)
-       {
-               ft_putstr_fd(argv[i], 1);
-               if (i + 1 < argc)
-                       ft_putstr_fd(" ", 1);
-               ++i;
-       }
-       if (flag == 0)
-               ft_putstr_fd("\n", 1);
-       return (0);
-}