mirror of
https://gitlab.os-k.eu/os-k-team/os-k.git
synced 2023-08-25 14:03:10 +02:00
cleanup
This commit is contained in:
parent
13d4e41983
commit
96b2eca790
@ -2,11 +2,7 @@
|
||||
|
||||
Fully open-source operating system from scratch (WIP), released under the GNU GPL version 3.0
|
||||
|
||||
<<<<<<< HEAD
|
||||
Branch boot : Development focused on the bootloader of OS/K
|
||||
=======
|
||||
Branch kaleid : Development focused on the Kaleid Kernel.
|
||||
>>>>>>> kaleid
|
||||
|
||||
For changelog, see src/ChangeLog.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user