From a398c0b52346eec254c0c4ada0892eac65455541 Mon Sep 17 00:00:00 2001 From: Matheus Date: Fri, 29 Jul 2022 17:05:36 -0300 Subject: [PATCH] fix weird git bug --- src/sys/mm/slab.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/sys/mm/slab.c b/src/sys/mm/slab.c index eff0b14f..7ada74a2 100644 --- a/src/sys/mm/slab.c +++ b/src/sys/mm/slab.c @@ -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)