mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-11-02 07:28:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix weird git bug

Browse Source
This commit is contained in:
Matheus
2022-07-29 17:05:36 -03:00
parent f58b65c612
commit a398c0b523
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sys/mm/slab.c
-3
View File
@@ -9,11 +9,8 @@
#define SLAB_SIZE PAGE_SIZE #define SLAB_SIZE PAGE_SIZE
// TODO have the slabs be in virtual memory rather than in the hhdm // TODO have the slabs be in virtual memory rather than in the hhdm
<<<<<<< HEAD
=======
// this isn't great but enough for an initial implementation // this isn't great but enough for an initial implementation
// redo this later // redo this later
>>>>>>> 3e78844 (Initial slab implementation)
// the layout of a slab in this implementation: // the layout of a slab in this implementation:
// header (slab_t) // header (slab_t)