removed exta characters

mtconnect · Apr 29, 2024 · 45e37cb · 45e37cb
1 parent 8f23034
commit 45e37cb
Showing 1 changed file with 1 addition and 6 deletions.
diff --git 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)