Merge branch 'post-10' into post-11

This commit is contained in:
Philipp Oppermann
2025-03-27 16:14:36 +01:00
2 changed files with 4 additions and 4 deletions

View File

@@ -8,7 +8,7 @@ extern crate alloc;
use alloc::{boxed::Box, vec::Vec};
use blog_os::allocator::HEAP_SIZE;
use bootloader::{entry_point, BootInfo};
use bootloader::{BootInfo, entry_point};
use core::panic::PanicInfo;
entry_point!(main);