From e06fbf37bf3735c27741a43c3ef91d4c5f50f1bd Mon Sep 17 00:00:00 2001 From: ekeleze Date: Mon, 31 Jul 2023 07:35:18 -0500 Subject: [PATCH] fix conflicts? --- bin/kernel.bin | Bin 0 -> 2938 bytes kernel.iso | Bin 0 -> 364544 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 bin/kernel.bin create mode 100644 kernel.iso diff --git a/bin/kernel.bin b/bin/kernel.bin new file mode 100644 index 0000000000000000000000000000000000000000..1a35551c07685e840740cd3334b545f10a6dd065 GIT binary patch literal 2938 zcmd5;Z-`V?6u)k3>fowH^oIyew2%w?$27!bv9>MEs8)7NrN)Lgvv+o$&b&L_cgJyJ z$)T3DgbX73`=Ou@LG)pD7u2*}Wiql@=t~rRi74_80~I8h2=n@#_h$d3RM4mH&c1uj zx#ygF&hMUk-m5KMG`VbMRrSNAr_Ig1ZDvJp%*0MC64nOwmU?Y+#muVu4^^J36HBJv zc-DRuOtehxI$&o4@Ouu}vq5!I9KS{!6LTs@16yaUw<`AiU}D8o$8+`_)`s=#!Nl^Z zdd0rneT5mduq}1 zjaG9VWM{|hrl!O7LDQ%!s2*<_IJpO5*;WDD>V&9VUSw{FZ<|~`zVetj5fdN9u=?b# z`uS@0xDbcGIehx?m#4%CvYA;mb$N86#h!1#eczb6uQjJ z(NQp83$2-Xl~+C&`e|mi^UB9UKgG;%qeqk-7kW1{$48H7`<~D{m^nEHwbz6uW-hYL zi$b^61>k=BSxb#tIqc#}W&PMH#z`oh2Z4PXIqjq0l*EMPz1N&~H zc6VU!T~_N3)|{IZGdK1wHP@p!Ix3eQHNS8%e1P-$sd7n}?*~3zEE?w~SBx*6Sv5}h z$6WtnTzmjg8`v1i;!x|M+ctbtT)N>ibM2PR^x*ab1DB~C>M^bC0Lv58#7q#Slx8C_k-{7ca_mR$=WyOwy-P)&@p93Z>^Lr=0xKN~JSQ&+Az>q6>PsZ5!mWmjE-M>HL!CXz{eZ<~ zTmj~m$G4ITgmuPAOZd*IVGb;UfVJHR2I8RYqZi4=00O9_@2OrqFJq~>T zMVE*VARNhA)j1*(AUYl+`1>mnv2Z|?OeT39(;N{oNjMu+Ik_=Ps9$+TyQ!j48fHC| zqy&xh%oE^Y5XlDsgPuKEe2KZBhJ;7u+GKcgj>J;nBw!BD`d>2SN2lM8vc6 zP~OL7w2}I7M!5_b2Uo?+mn)xdf`dMPXe0+B{=dsIU|NNOyeIB0Sr4GlLls; zbkF{NHN<7L325-ajL>Rq2q)OF3B=$wpR`0z+84IsmF=!ST~;6;xY z2cO|EUfDjsVVV`tPJ-~yFB9>99{3cqH(lh9)EGWdr}1TY%SHY~JT+=xzEJ%W6;8;g literal 0 HcmV?d00001 diff --git a/kernel.iso b/kernel.iso new file mode 100644 index 0000000000000000000000000000000000000000..150c18da89f07fdcb3a83e464e34efdb8b7a0e22 GIT binary patch literal 364544 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 z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N O0t5&UAVA>96ZjtlDxWw2 literal 0 HcmV?d00001