fix conflicts?

9xbt · Jul 31, 2023 · e06fbf3 · e06fbf3
1 parent 0258db8
commit e06fbf3
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 0 deletions.
diff --git a/bin/kernel.bin b/bin/kernel.bin
diff --git a/kernel.iso b/kernel.iso