small changelog tweak

2023-06-20 18:22:43 +02:00 · 2023-06-20 18:22:43 +02:00 · 6ed2fcd904
commit 6ed2fcd904
parent 3ee9a914cc
1 changed files with 0 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -147,7 +147,6 @@ will consitute of a breaking change warranting a new major release:
 - CFDP funnel did not route packets to live channel VC0

 # [v2.0.5] 2023-05-11
->>>>>>> origin/main

 - The dual lane assembly transition failed handler started new transitions towards the current mode
  instead of the target mode. This means that if the dual lane assembly never reached the initial