Update versions.md

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>
eProsima · Jun 24, 2024 · f4bb27c · f4bb27c
1 parent 3631bed
commit f4bb27c
Showing 1 changed file with 5 additions and 0 deletions.
diff --git 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
 --------------