Fix merge problems in LM-GENDLT-15

[profile/ivi/dlt-daemon.git] / ReleaseNotes.txt

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