Fix merge problems in LM-GENDLT-15

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

2 files changed, 5 insertions, 1 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85a1ad8..9898d5c 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ set( DLT_MAJOR_VERSION 2)
 set( DLT_MINOR_VERSION 6)

 set( DLT_PATCH_LEVEL 0)

 set( DLT_VERSION ${DLT_MAJOR_VERSION}.${DLT_MINOR_VERSION}.${DLT_PATCH_LEVEL})

-set( DLT_VERSION_STATE BETA )

+set( DLT_VERSION_STATE RELEASE )

 set( DLT_REVISION "")

 

 execute_process(COMMAND git describe --tags WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} 

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 57e9683..b2494de 100755
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,6 +1,10 @@
 DLT - Automotive Diagnostic Log and Trace

 

+<<<<<<< HEAD

 Version: 2.6.0

+=======

+Version: 2.5.0

+>>>>>>> bafb569... Fix merge problems in LM-GENDLT-15

 

 This component provides a standardised log and trace interface, based on the

 standardised protocol specified in the AUTOSAR standard 4.0 DLT.