versioning fix

2024-08-02 23:36:34 -04:00 · 2024-08-02 23:36:34 -04:00 · c3fdfbade6
parent d579ddf1cc
commit c3fdfbade6
1 changed files with 0 additions and 5 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,11 +1,6 @@
 cmake_minimum_required(VERSION 3.20)
 include(cmake/color.cmake)
-
-<<<<<<< HEAD
-set(BLT_VERSION 0.18.14)
-=======
 set(BLT_VERSION 0.18.15)
->>>>>>> refs/remotes/origin/main
 set(BLT_TEST_VERSION 0.0.1)

 set(BLT_TARGET BLT)