Fix conflicts

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
eProsima · Feb 15, 2024 · b1ad179 · b1ad179
1 parent 6e2844e
commit b1ad179
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/versions.md b/versions.md
@@ -1,13 +1,9 @@
 Forthcoming
 -----------
 
-<<<<<<< HEAD
-Version 2.10.3
-=======
 * Added `non_blocking_send` to TCP Transport.
 
-Version 2.13.0
->>>>>>> b5f8c8adc (TCP non-blocking send (#4237))
+Version 2.10.3
 --------------
 
 * Added the possibility to define a listening port equal to 0 in TCP Transport