From 86030f81a399a37bd1ec495e2e318854e1b60762 Mon Sep 17 00:00:00 2001
From: Sebastian Castro <sebas.a.castro@gmail.com>
Date: Sun, 17 Nov 2024 17:08:47 -0500
Subject: [PATCH] Fix conflicts

---
 .github/workflows/deploy.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 28585b748f..498da17961 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -27,16 +27,11 @@ jobs:
     - name: Install Python dependencies
       shell: bash
       run: |
-<<<<<<< HEAD
-        python -m pip install --upgrade pip
-        pip install --upgrade --requirement requirements.txt
-=======
         sudo apt-get update -y
         sudo apt-get install -y python3-pip python3-venv
         python3 -m venv .venv
         source .venv/bin/activate
         pip3 install --upgrade --requirement requirements.txt
->>>>>>> 1709ece (Use venv in CI (#916))
 
     - name: Install doxygen and graphviz
       run: sudo apt-get install -y doxygen graphviz
@@ -46,16 +41,12 @@ jobs:
         ruby-version: '3'
 
     - name: Run htmlproofer.sh
-<<<<<<< HEAD
-      run: ./htmlproofer.sh
-=======
       shell: bash
       run: |
         source /opt/ros/rolling/setup.bash
         source /root/ws_moveit/install/setup.bash
         source .venv/bin/activate
         ./htmlproofer.sh
->>>>>>> 1709ece (Use venv in CI (#916))
 
   upload_site_artifacts:
     strategy: