From ae82e9c24b22fd3b2c33eda8e8be3fe92a89eb17 Mon Sep 17 00:00:00 2001
From: zxq5 <zxq5@zxq5.dev>
Date: Sat, 22 Feb 2025 03:27:08 +0000
Subject: [PATCH] idk

---
 kernel/src/arch/x86_64/mod.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/kernel/src/arch/x86_64/mod.rs b/kernel/src/arch/x86_64/mod.rs
index 7bd6bd6..341df6d 100644
--- a/kernel/src/arch/x86_64/mod.rs
+++ b/kernel/src/arch/x86_64/mod.rs
@@ -1,5 +1,4 @@
-<<<<<<< Updated upstream
-=======
+
 pub mod gdt;
->>>>>>> Stashed changes
+
 pub mod interrupts;