Fix conflict of versions.md

Signed-off-by: Javier Gil Aviles <[email protected]>
eProsima · Dec 17, 2024 · 328cd97 · 328cd97
1 parent 2bcbcc8
commit 328cd97
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/versions.md b/versions.md
@@ -2,11 +2,8 @@ Forthcoming
 -----------
 
 * New property to configure the preferred key agreement algorithm.
-<<<<<<< HEAD
 * Windows ci example testing infrastructure and `hello world` example.
-=======
 * Refactor benchmark example.
->>>>>>> e99d6f3f (Benchmark example updated (#5460))
 
 Version v3.1.0
 --------------