fix merge conflicts
This commit is contained in:
commit
49de9e9ff6
|
@ -1,3 +1,6 @@
|
||||||
|
#
|
||||||
|
# shadeOS Build System
|
||||||
|
#
|
||||||
cmake_minimum_required(VERSION 3.10)
|
cmake_minimum_required(VERSION 3.10)
|
||||||
project(shadeOS LANGUAGES C ASM_NASM)
|
project(shadeOS LANGUAGES C ASM_NASM)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue