Fix merge conflicts

.github/workflows/sphinx-make-page.yml

@@ -17,30 +17,20 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-python@v4
       with:
-<<<<<<< HEAD
-        python-version: '3.8'
-=======
         python-version: '3.10'
->>>>>>> 5dfd401 (Fix workflows for PRs (#135))
         cache: 'pip'
     - name: Install Python dependencies
       run: |
         python -m pip install --upgrade pip
         pip install --upgrade --requirement requirements.txt
-<<<<<<< HEAD
-=======
       shell: bash
->>>>>>> 5dfd401 (Fix workflows for PRs (#135))
     - name: Install generate_parameter_library
       run: |
         cd
         git clone https://github.com/PickNikRobotics/generate_parameter_library.git
         cd generate_parameter_library/generate_parameter_library_py/
         python -m pip install .
-<<<<<<< HEAD
-=======
       shell: bash
->>>>>>> 5dfd401 (Fix workflows for PRs (#135))
     - name: Install doxygen and graphviz
       run: sudo apt-get install -y doxygen graphviz
     - name: Build multiversion with API

make_help_scripts/add_tmp_commits

@@ -17,13 +17,9 @@ add_sub_repositories_and_commit () {
         git checkout "$branch"
         # change .gitignore, needed to include subrepositorie. sed matches doc/ros2_control*, so all subrepositorie are excluded
         sed -i "s/doc\/ros2_control/\#doc\/ros2_control/g" .gitignore
-<<<<<<< HEAD
-        # clone all subrepositorie and add as tmp commit to branch of multi version
-=======
         sed -i "s/doc\/gz_ros2_control/\#doc\/gz_ros2_control/g" .gitignore
         sed -i "s/doc\/gazebo_ros2_control/\#doc\/gazebo_ros2_control/g" .gitignore
         # clone all subrepositories and add as tmp commit to branch of multi version
->>>>>>> 5dfd401 (Fix workflows for PRs (#135))
         echo "Clone repositories for $branch and checkout ${branch_version[$branch]}"
         for repo_name in "${!subrepo_url[@]}";
             do echo "Create doc/$repo_name";