Fix conflicts

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

Author: MiguelCompany

docs/requirements.txt

@@ -3,28 +3,15 @@ colcon-common-extensions==0.2.1
 colcon-mixin==0.2.0
 doc8==0.10.1
 docutils==0.20.1
-<<<<<<< HEAD
 GitPython==3.1.41
-setuptools==70.0.0
+setuptools==78.1.1
 sphinx_rtd_theme==2.0.0
 sphinx-tabs==3.4.5
 # TODO(anyone) remove if https://github.com/sphinx-doc/sphinx/pull/12298/files is merged
 sphinx==7.2.6
 sphinxcontrib-applehelp==1.0.8
 sphinxcontrib-devhelp==1.0.6
 sphinxcontrib-htmlhelp==2.0.5
-=======
-furo==2024.8.6
-GitPython==3.1.44
-setuptools==78.1.1
-sphinx==8.2.1
-sphinx-copybutton==0.5.2
-sphinx-design==0.6.1
-sphinx_rtd_theme==3.0.2
-sphinxcontrib-applehelp==2.0.0
-sphinxcontrib-devhelp==2.0.0
-sphinxcontrib-htmlhelp==2.1.0
->>>>>>> 52ce7fa (Bump setuptools to 78.1.1 (#1069))
 sphinxcontrib-imagehelper==1.1.1
 sphinxcontrib-plantuml==0.29
 sphinxcontrib-qthelp==1.0.7