From d7313eb1c98e43d8a6b7895649731adbbf08a553 Mon Sep 17 00:00:00 2001
From: JesusPoderoso <jesuspoderoso@eprosima.com>
Date: Thu, 11 Jul 2024 08:50:34 +0200
Subject: [PATCH] Refs: 21231: Fix conflicts

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
---
 docs/fastdds/xml_configuration/domainparticipant.rst | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/fastdds/xml_configuration/domainparticipant.rst b/docs/fastdds/xml_configuration/domainparticipant.rst
index e6171c3ef..ddef59ad6 100644
--- a/docs/fastdds/xml_configuration/domainparticipant.rst
+++ b/docs/fastdds/xml_configuration/domainparticipant.rst
@@ -215,11 +215,7 @@ These elements allow the user to define the DomainParticipant configuration.
     :language: xml
     :start-after: <!-->XML-PARTICIPANT<-->
     :end-before: <!--><-->
-<<<<<<< HEAD
-    :lines: 2-4, 6-126, 128-129
-=======
     :lines: 2-4, 6-150, 152-153
->>>>>>> 6e7f076 (Complete flow_controller_descriptor references in xml sections (#824))
 
 .. note::