fix weird git bug

2026-10-27 12:48:22 +00:00 · 2022-07-29 17:05:36 -03:00
parent f58b65c612
commit a398c0b523
1 changed files with 0 additions and 3 deletions
@@ -9,11 +9,8 @@
 #define SLAB_SIZE PAGE_SIZE

 // TODO have the slabs be in virtual memory rather than in the hhdm
-<<<<<<< HEAD
-=======
 // this isn't great but enough for an initial implementation
 // redo this later
->>>>>>> 3e78844 (Initial slab implementation)

 // the layout of a slab in this implementation:
 // header (slab_t)