From f346c5c2ce0620c4d1dec639a4ae4dbce63d4264 Mon Sep 17 00:00:00 2001
From: Camille Chauvet <cchauvet@1A5.42angouleme.fr>
Date: Tue, 21 Feb 2023 23:31:16 +0100
Subject: [PATCH] merge

---
 builtins/.echo.c.swp | Bin 0 -> 12288 bytes
 builtins/echo.c      |  14 +-------------
 2 files changed, 1 insertion(+), 13 deletions(-)
 create mode 100644 builtins/.echo.c.swp

diff --git a/builtins/.echo.c.swp b/builtins/.echo.c.swp
new file mode 100644
index 0000000000000000000000000000000000000000..89a016f5cf36cec3f912805ad8d39f3434dfb6e9
GIT binary patch
literal 12288
zcmeI2+iP4!9LFaGFJq0D`lK&TvXZ^uqsDFHtwj)O5itsG)^KumwtLLxY&d&1HTIIA
z@vWc;q7?)$MSSz2`Xa4DrD$J#QvU$o1VI!9FE4(7GiUZvw>6UZP?%FbnK^TQ^PS)M
z{$?6V&tl=JM;{Y2xgx`L3uB2#esf>iOz+Nr#hL3io$jg(>Cu(0;zM`mrb~{0xZQ2Z
zWtnRPqoYq4!TfY7zwG&5rzu;l{9@N@g`VHZOSjq1xufUWQR{$pU>go}!$x*yoRv$(
z0;$9%C&X=g=C&bdr&<TB1J(iSfOWt+U>&dySO=^FSDORj${1Tm(z~L>ov0nVq>XNE
zV;!&#SO=^F)&c8)b-+4c9k32q2do3u0qek3=zvpa?A$es)viPG`2T<N@Bfc(X6#uo
z4$j`h*b=w{TpVZYc@PKR-N@L>U=utCJn$rV0^AP%+RfM>;CJvPxB$+9v*2U!4tN`Q
zK!O@L03HC-;4W|{_~{15egI#C^WZb^33v;<23`R#f(@_^8lVoI0f)c=un+77C6EB)
z;788br{F_y3cL!sAOKmg2mE?HV?Tp$zy<IHI1f&P_rUAmB-jA!U<oXMr@<_^2iywA
z!1wU@TkttJ13mz!!TVqXoB%#>0M+Ahupj(#Eo1M3Q{W`n1ZA)b{E6CK1aE>jfW52(
z)`5R_;CL#}cp$@W;EO~dxtDS2?(|r*ohW966C7TJ{!x}sd49N^HAd<2WykXqml595
zgi#r7Y2u)DSDZi=xEX=3$pVogJF2xLW5;{`n+!~=gw2g<cYL+~M{p?Jp_^!vZObXW
zQyYPliB1^MuH{DpFO-Q!JtHRP{mG0d(x}%Ei3ztU-K8W#8sWl9HzfNP8g-gj_0s8D
zMl|Xad!*^Lq|n2t3-`n<N`<KlC{=e^`XN2bh$%Ig5uREW3jMiWXQ8v=xGJftS4&1J
z1w^PxP^3O&NW1O34oP+(L;+5~Q@BL{wlU|P>8Po6aA=sm4Ww<3q|HvENu8mMM5>e>
znkrrzO-uS}u!e=>^MyDbV&C!0MF<K|?vZxY6KPSbiHTWpXzt*_$VyUmoyZg&MqUmr
zhj~K-kg6pySfcEX4tn0HrqkZw5@dh2NNGfWJJHg(rIKPbG22T<-HC)gR!LgWby}^q
zo4`v`;u+ELUXbmEib&GRTs@h+Ol}D1?}dNlMN@SdO@^vog36^+Sn2hU8TwQ$%%TeF
z09|?AA5lEDu~c>R<}%rg*j;Lqu3-&bO}-dNXGzdKm#vNzky&t^iWm3eR6EW`2EfpG
zHZG>71ky&yvr)-0sAj2*c*<;KRT|FMU<SQ9r*i5oGb&FWy$S_I=1yE1CypJ9j-TFc
zQ9^WzFm2#f^aBjj;y6&sVh$Vh5m6cT53TkY?}Q_ZO6V8ReNUenj)h&?Q1SU7PFX}Z
zunTWyemUwvF&NMoyjdN*3FA>Ry_ZyJxL7de`EILQmtr!P>wo>5Yfdu!W)!I%y99o-
zLvRN#BRIEGcS2dOh*F_c&KFAgQc;x3m2$CCm==p`!hGJ`TRIktp^u;H!gtZp6C=1E
z+jdB>c&{jyD~0<ig&7i*fn3Wj%CILWVrfz|O>f)?_6D}nNkc69gK+c)CK<tp*DC!i
z_ANWXs^>pAUBau}KM>vPDv@->C=F;D!CvTAJEYcEM4pkl5!4@zZ&gjjRniq5A9ZwN
f1pkwi39eL(Bzkn=!L|gA@L;P2ckH0x(B;|Rp)m-p

literal 0
HcmV?d00001

diff --git a/builtins/echo.c b/builtins/echo.c
index 2e21e52..2c3bff4 100644
--- a/builtins/echo.c
+++ b/builtins/echo.c
@@ -6,19 +6,7 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/17 13:09:08 by erey-bet          #+#    #+#             */
-<<<<<<< HEAD
-<<<<<<< HEAD
-/*   Updated: 2023/02/21 22:24:51 by erey-bet         ###   ########.fr       */
-=======
-<<<<<<< HEAD
-/*   Updated: 2023/02/21 21:45:38 by cchauvet         ###   ########.fr       */
-=======
-/*   Updated: 2023/02/21 22:09:55 by erey-bet         ###   ########.fr       */
->>>>>>> 1fdc51a668e616de94c33d5b3b1e9cb51182916d
->>>>>>> eb4a8ed663b2f93cd955f7608aa686bd8e767a65
-=======
-/*   Updated: 2023/02/21 22:15:27 by cchauvet         ###   ########.fr       */
->>>>>>> 76bc8fbfd8d5413e8f6e4f3eb6ec00db0fa3c884
+/*   Updated: 2023/02/21 23:31:04 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */