From 45e37cbb900b034240d5ee2f2e60365d1ae10956 Mon Sep 17 00:00:00 2001 From: Will Sobel Date: Sun, 28 Apr 2024 22:55:03 -0400 Subject: [PATCH] removed exta characters --- CMakeLists.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9cd4564c..2ea263a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,13 +2,8 @@ set(AGENT_VERSION_MAJOR 2) set(AGENT_VERSION_MINOR 5) set(AGENT_VERSION_PATCH 0) -<<<<<<< HEAD set(AGENT_VERSION_BUILD 0) -set(AGENT_VERSION_RC "RC2") -======= -set(AGENT_VERSION_BUILD 8) -set(AGENT_VERSION_RC "") ->>>>>>> de28136e (version 2.3.0.8) +set(AGENT_VERSION_RC "RC2") # This minimum version is to support Visual Studio 2019 and C++ feature checking and FetchContent cmake_minimum_required(VERSION 3.23 FATAL_ERROR)