misc: Tidy rebase leftovers

devitocodes · May 21, 2024 · b166762 · b166762
1 parent 84b6e23
commit b166762
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/.github/workflows/pytest-core-nompi.yml b/.github/workflows/pytest-core-nompi.yml
@@ -36,11 +36,7 @@ jobs:
            pytest-ubuntu-py310-gcc10-noomp,
            pytest-ubuntu-py312-gcc13-omp,
            pytest-ubuntu-py39-gcc9-omp,
-<<<<<<< HEAD
            pytest-osx-py312-clang-omp,
-=======
-           pytest-osx-py38-clang-omp,
->>>>>>> 84f366ba7 (reqs: Drop Python 3.7 as end-of-life)
            pytest-docker-py39-gcc-omp,
            pytest-docker-py39-icx-omp
         ]
@@ -88,13 +84,8 @@ jobs:
           language: "openmp"
           sympy: "1.9"
 
-<<<<<<< HEAD
         - name: pytest-osx-py312-clang-omp
           python-version: '3.12'
-=======
-        - name: pytest-osx-py38-clang-omp
-          python-version: '3.8'
->>>>>>> 84f366ba7 (reqs: Drop Python 3.7 as end-of-life)
           os: macos-latest
           arch: "clang"
           language: "C"