From f4bb27c5f88ec61b77f52b9133efe08ff6747bb0 Mon Sep 17 00:00:00 2001
From: Lucia Echevarria <luciaechevarria@eprosima.com>
Date: Tue, 18 Jun 2024 11:10:07 +0200
Subject: [PATCH] Update versions.md

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>
---
 versions.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/versions.md b/versions.md
index a48ac95e29e..d7c8c6e9bdc 100644
--- a/versions.md
+++ b/versions.md
@@ -59,7 +59,12 @@ Forthcoming
   * `SenderResource` and Transport APIs now receive a collection of `NetworkBuffer` on their `send` method.
 * Migrate fastrtps namespace to fastdds
 * Migrate fastrtps `ResourceManagement` API from `rtps/resources` to `rtps/attributes`.
+<<<<<<< HEAD
 * `const` qualify all data related inputs in DataWriter APIs
+=======
+* New `DomainParticipantExtendedQos` that includes both `DomainId` and `DomainParticipantQos` (extends `DomainParticipantFactory` API).
+
+>>>>>>> 463834195 (Update versions.md)
 
 Version 2.14.0
 --------------