From c870019fc4ac298df43e19813a661d655e26813c Mon Sep 17 00:00:00 2001
From: Blanca Fuentes <blafuemon@gmail.com>
Date: Tue, 14 Jan 2025 10:18:47 +0100
Subject: [PATCH] Fix merge conflict

---
 .github/workflows/main.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bbc88c83c..543586ed5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -138,11 +138,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-<<<<<<< HEAD
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
-=======
         python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
->>>>>>> upstream/develop
     steps:
       - uses: actions/checkout@v4
       - name: Setup up Python ${{ matrix.python-version }}
@@ -165,11 +161,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-<<<<<<< HEAD
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
-=======
         python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
->>>>>>> upstream/develop
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}