fixed weird merge issues

2025-02-22 03:29:33 +00:00
parent ae82e9c24b
commit bb5bf9115b
3 changed files with 3 additions and 14 deletions
@@ -37,15 +37,12 @@ unsafe extern "C" fn kmain() -> ! {
             \\______/  \\______/           \\_/    \\______|                              
    "
    );
-<<<<<<< Updated upstream
-=======

    // for i in 0..100000 {
    //     println!("{}", i);
    // }

    loop {}
->>>>>>> Stashed changes

    FoundryOS::hcf();
 }