fixed weird merge issues

kernel/src/arch/x86_64/interrupts.rs

@@ -18,8 +18,7 @@ static IDT: Lazy<InterruptDescriptorTable> = Lazy::new(|| {
     idt
 });
 
-<<<<<<< Updated upstream
-=======
+
 pub const PIC_1_OFFSET: u8 = 32;
 pub const PIC_2_OFFSET: u8 = PIC_1_OFFSET + 8;
 
@@ -43,7 +42,7 @@ impl InterruptIndex {
     }
 }
 
->>>>>>> Stashed changes
+
 pub fn init_idt() {
     IDT.load();
     unsafe {
@@ -53,10 +52,6 @@ pub fn init_idt() {
 }
 
 extern "x86-interrupt" fn breakpoint_handler(stack_frame: InterruptStackFrame) {
-<<<<<<< Updated upstream
-    println_log!("Exception: Breakpoint\n{:#?}", stack_frame);
-}
-=======
     serial_println!("Exception: Breakpoint\n{:#?}", stack_frame);
     println_log!("Exception: Breakpoint\n{:#?}", stack_frame);
 }
@@ -92,4 +87,4 @@ extern "x86-interrupt" fn timer_interrupt_handler(_stack_frame: InterruptStackFr
             .notify_end_of_interrupt(InterruptIndex::Timer.as_u8());
     }
 }
->>>>>>> Stashed changes
+

kernel/src/lib.rs

@@ -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(())
 }

kernel/src/main.rs

@@ -37,15 +37,12 @@ unsafe extern "C" fn kmain() -> ! {
              \\______/  \\______/           \\_/    \\______|                              
     "
     );
-<<<<<<< Updated upstream
-=======
 
     // for i in 0..100000 {
     //     println!("{}", i);
     // }
 
     loop {}
->>>>>>> Stashed changes
 
     FoundryOS::hcf();
 }