merge: resolve conflict in README.md
This commit is contained in:
@@ -128,10 +128,8 @@ make run KARCH=aarch64
|
||||
|
||||
## Development Plan (TODO)
|
||||
|
||||
### Detailed Task List
|
||||
|
||||
| # | Task | Subtasks | Priority | Dependencies |
|
||||
| --- | --------------------------- | ---------------------------------- | -------- | ------------ |
|
||||
|---|------|----------|----------|--------------|
|
||||
| 1 | **Descriptor memory model** | | High | PMM, VMM |
|
||||
| | | 1.1. `MemoryObject` structure | | |
|
||||
| | | 1.2. Descriptor table per process | | |
|
||||
|
||||
Reference in New Issue
Block a user