Fix merge problems in LM-GENDLT-15

Signed-off-by: Christian Muck <christian.muck@bmw.de>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85a1ad8..9898d5c 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ set( DLT_MAJOR_VERSION 2)
 set( DLT_MINOR_VERSION 6)\r
 set( DLT_PATCH_LEVEL 0)\r
 set( DLT_VERSION ${DLT_MAJOR_VERSION}.${DLT_MINOR_VERSION}.${DLT_PATCH_LEVEL})\r
-set( DLT_VERSION_STATE BETA )\r
+set( DLT_VERSION_STATE RELEASE )\r
 set( DLT_REVISION "")\r
 \r
 execute_process(COMMAND git describe --tags WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} \r

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 57e9683..b2494de 100755 (executable)
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,6 +1,10 @@
 DLT - Automotive Diagnostic Log and Trace\r
 \r
+<<<<<<< HEAD\r
 Version: 2.6.0\r
+=======\r
+Version: 2.5.0\r
+>>>>>>> bafb569... Fix merge problems in LM-GENDLT-15\r
 \r
 This component provides a standardised log and trace interface, based on the\r
 standardised protocol specified in the AUTOSAR standard 4.0 DLT.\r