From b331edf585b030f213483ba663ba673aca25f302 Mon Sep 17 00:00:00 2001 From: Ericson Soares Date: Wed, 14 Aug 2024 16:56:20 -0300 Subject: [PATCH] Bad merge --- Cargo.lock | Bin 313094 -> 300290 bytes core/Cargo.toml | 1 - 2 files changed, 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 5b75528e48ea5ae8722a2f7960728e4927690c28..65b05c1670386717e3923efcc9dd0c75f6ec72d5 100644 GIT binary patch delta 3681 zcmb7HYiu3G71r)v+i{#Yj-A|_hm#od2++pN?Ck9Blq3!y(YOL7aY~9rshORbwQpnW z>uWpIv;;y^Kot#kw`EFI)coM3@N&2_eBU|W+_kOY&K>omk6ZJaPz!Exn?FCjsku}2sA66$pLYFF* z*OVTu_|LS`)`r?8rCsa(TA@2`HQP(iUVlZVbmYb(Gxfps=Gv8tDZ$)OG4A7lD&o?R z$-u**LP&wrp>hPbh47>ZJm1A3auGq;=APi()?;;6POs|BROr>mthxHc&y3~Ks=kWS zo85OCkx^U{eYfY=$+Ps$-nQD()0;QVI^+MP(VA`3qOW~#)-;UZjD@1ovzyHID_qVP z7nBD|`o8NZuB0RZqbig-1Ba9Ty_7%46u|RRpBcX#F&arO`%0kaYO4&>zhMa&vh$(~>J47NRsSQvOOavsl z=}0abuE=~DEVya%TTt1RGu}-`?0=o4WiKX9JH=Htu~Fi0DZH=F%);)IP|o-C4i2Qh zNqU~AhUe&)+cMX;3J(jP5lJ~#zD+&k_%aA=#;7B0g+rf05-`UUFyVw)sxn-BoPA8z~1Pz(mM{h)>UzI`6NkDAAv^%`5SrcU0*2UpCsK zmOX)P8MWp|qkB%32Zx?t8Xeh_t(@k4?k1G$k4nPt4Oyk*RPA@-UHbf6~H)t|y)$7~F&0Ms9cV%?!`MvWY7L%ks z8*b6wy;o+ENa?;Vi=^vc-dhu0xo_8+&-~`x5Iw6joddKbwjXB_Q%-c?SYv7HFWP1` z1%v&|`jsfE0eBQQ<%MdVzDX7P^SwPyE1H@eePGO7--?0tNZ1Y*2y^L6V5;X!N+Cd= zB!1|71jxz-c9r0Sa7sKRU5a>MQ|dd>$RBbRSkhatF+aNHmtJ(}wffSFua8ZK0=gi2 z^{u(l;kVyNN(4Yt8#&{`(&2Y1>!S~k?a*Td2;#1fYMavo6+_`NkEP@Od}mL}>GH3_ z#%Skj3!}xytD*}&-kmK^s-jd=7whvntj5yf zaL3kLt~RqXx`u*cUY5IJY9j7?(zvA}$tl1-{_`_N^|W~JZsTutSv6G5_jH~GGtz=| z-}X%VNPaZa^;+=<#AJ;|q4KI%KZyJAG9_FTS9M?=lZADt{(qKR?F?@we|b z|9MH-dWx)cO@A5FdjF`I(N8~P?w&SvI)0#JuBuA-OjDVlkM1&a21}E=(t|WP#Iple zc+8cahkeGd?*_^i2`8~1N?~K+`qEW)GV6sQr-*T>n2dIA%IO`?nU^I>q}+^>YORkw zXO5pS7-#mF&sIeT_bkvIFPYQhKfPcc!1K;ZY|>ECGTvS2;?dae*0lvdDX6N4bWAcc=HCP(eD+Vp01S8?jRBYaYEO%NnmrP ze83o{5HJk&4y2wdU2r^L&^UzSa^-X8+YrP6MTX4jua27w&+Mw}ENhY8{0X#)S4pNl z{`a_fv!NdtHyfs`Ik3ZMU+E}DLdrpw32OU7a?nK}bzn$vUwSvig(ppuba`@zpRhn z&RS+oTAlRccbm0(RTBjdhZ8hqLg|$F`tHY{^ z&u_CDjH-=gp2zr0*1?*}a*@@>2J7Nl#pP*O0r9u5wz9Ve-F%}Wsj12KI7PP=fFjgM;zr7SJ~!taws4 zd??8zM1s0LNhkm}1B|%ar@6{g>*VJFGc6cUfju zw02*6{HxooH8pYFy;fg!6+{bkEsnSR(AqMy9Fvs~SxSHOp1B}?;UQ~n^~B{NZg|Qv zP2D(Zc^Ypu8&Y`2w~bo2w#7$JTKBW53PSHBnMITLGD5K@JrLu917{Ij#%#E6NeG|^ z`r8GT5rkZuyFSGTm}mPEGbw$W2+%e%DLaXvtpQgj1#K!*;zym#`pWqE%QNp*#vNB> gx~tC7K+4@dJASqP;F?TjJoB2&BPt$zCNnbUzpXilng9R* delta 10261 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 diff --git a/core/Cargo.toml b/core/Cargo.toml index 036963745..18880366a 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -96,7 +96,6 @@ uuid = { workspace = true, features = ["serde", "std", "v4", "v7"] } webp = { workspace = true } # Specific Core dependencies -async-stream = "0.3.5" bytes = "1.6" ctor = "0.2.8" flate2 = "1.0"