fix merge conflicts

This commit is contained in:
c0repwn3r 2022-06-12 15:29:26 -04:00
commit 49de9e9ff6
Signed by: core
GPG Key ID: FDBF740DADDCEECF
1 changed files with 3 additions and 0 deletions

View File

@ -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)