static function check

2025-01-15 19:08:29 -05:00 · 2025-01-15 19:08:29 -05:00 · d34174ece4
parent eca09acc01
commit d34174ece4
1 changed files with 4 additions and 0 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,6 +1,10 @@
 cmake_minimum_required(VERSION 3.20)
 include(cmake/color.cmake)
+<<<<<<< HEAD
 set(BLT_VERSION 2.1.16)
+=======
+set(BLT_VERSION 2.1.14)
+>>>>>>> cf6cbbd (make write profile work)

 set(BLT_TARGET BLT)