merge: resolve conflict in README.md

This commit is contained in:
Faynot
2026-06-23 22:52:59 +03:00

View File

@@ -128,10 +128,8 @@ make run KARCH=aarch64
## Development Plan (TODO) ## Development Plan (TODO)
### Detailed Task List
| # | Task | Subtasks | Priority | Dependencies | | # | Task | Subtasks | Priority | Dependencies |
| --- | --------------------------- | ---------------------------------- | -------- | ------------ | |---|------|----------|----------|--------------|
| 1 | **Descriptor memory model** | | High | PMM, VMM | | 1 | **Descriptor memory model** | | High | PMM, VMM |
| | | 1.1. `MemoryObject` structure | | | | | | 1.1. `MemoryObject` structure | | |
| | | 1.2. Descriptor table per process | | | | | | 1.2. Descriptor table per process | | |