From 328cd976df21e05d3a3b1f16362ad80e21d7c597 Mon Sep 17 00:00:00 2001
From: Javier Gil Aviles <javiergil@eprosima.com>
Date: Tue, 17 Dec 2024 11:48:14 +0100
Subject: [PATCH] Fix conflict of versions.md

Signed-off-by: Javier Gil Aviles <javiergil@eprosima.com>
---
 versions.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/versions.md b/versions.md
index 64d073533c0..e1a2eb95fd8 100644
--- 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
 --------------