aboutsummaryrefslogtreecommitdiff
path: root/arch/x86_64/src/kernel
diff options
context:
space:
mode:
authorFabian Imhof <fabian.imhof@ost.ch>2024-10-22 07:40:42 +0000
committerFabian Imhof <fabian.imhof@ost.ch>2024-10-22 07:40:42 +0000
commit8911e405e1d04676f9dd9129c3cfeccd9379b785 (patch)
tree2c78dff925145547871206cb5e0c3b6ea9c6f60f /arch/x86_64/src/kernel
parent5a2892f65abe13c32bb07de697826f374c1d2b1d (diff)
parentba054441f93a30e2042a71d632a6a5fb04007d15 (diff)
downloadteachos-8911e405e1d04676f9dd9129c3cfeccd9379b785.tar.xz
teachos-8911e405e1d04676f9dd9129c3cfeccd9379b785.zip
Merge branch 'feat_memory_manager' of ssh://gitlab.ost.ch:45022/teachos/kernel into feat_memory_manager
Diffstat (limited to 'arch/x86_64/src/kernel')
-rw-r--r--arch/x86_64/src/kernel/main.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86_64/src/kernel/main.cpp b/arch/x86_64/src/kernel/main.cpp
index 3e25d2d..ad1eb39 100644
--- a/arch/x86_64/src/kernel/main.cpp
+++ b/arch/x86_64/src/kernel/main.cpp
@@ -10,7 +10,6 @@
namespace teachos::arch::kernel
{
-
auto main() -> void
{
video::vga::text::clear();