From c3fdfbade61fbeda060d138f126ba61955b4ac06 Mon Sep 17 00:00:00 2001 From: Brett Date: Fri, 2 Aug 2024 23:36:34 -0400 Subject: [PATCH] versioning fix --- CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 55d077d..a915f7c 100644 --- 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)