Solve conflicts

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
eProsima · Mar 12, 2024 · b6387c3 · b6387c3
1 parent eb79f72
commit b6387c3
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/versions.md b/versions.md
@@ -1,15 +1,12 @@
 Forthcoming
 -----------
 
-<<<<<<< HEAD
-=======
 * Added authentication handshake properties.
 
 Version 2.13.0
 --------------
 
 * Added monitor service feature.
->>>>>>> da58d84ae (Expose Authentication Handshake Properties (#4435))
 * Enable configuration of thread setting for all threads.
 * Added monitor service feature.
 * Added the possibility to define interfaces in the whitelist by interface name.