Fix merge conflict

reframe-hpc · Jan 14, 2025 · c870019 · c870019
1 parent 3505af3
commit c870019
Showing 1 changed file with 0 additions and 8 deletions.
diff --git 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 }}