1 files changed, 4 insertions, 0 deletions
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.