os-k-team/os-k
os-k-team
/
os-k
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

cleanup

This commit is contained in:
Adrien Bourmault 2018-12-27 09:12:42 +01:00
parent 13d4e41983
commit 96b2eca790
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -2,11 +2,7 @@
Fully open-source operating system from scratch (WIP), released under the GNU GPL version 3.0 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 boot : Development focused on the bootloader of OS/K
=======
Branch kaleid : Development focused on the Kaleid Kernel.
>>>>>>> kaleid
For changelog, see src/ChangeLog. For changelog, see src/ChangeLog.