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
@@ -55,10 +55,7 @@ pub fn boot() -> Result<(), &'static str> {
    lib_serial::init()?;
    arch::x86_64::interrupts::init_idt();

-<<<<<<< Updated upstream
-=======
    x86_64::instructions::interrupts::enable();

->>>>>>> Stashed changes
    Ok(())
 }