Refs: 21231: Fix conflicts

Signed-off-by: JesusPoderoso <[email protected]>
eProsima · Jul 11, 2024 · d7313eb · d7313eb
1 parent f3660d2
commit d7313eb
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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::