Fix leftover merge conflicts in build.yml

Signed-off-by: Fabrice Normandin <fabrice.normandin@gmail.com>
Epistimio · Jul 4, 2022 · bb5c8b1 · bb5c8b1
1 parent ec2e440
commit bb5c8b1
Showing 1 changed file with 0 additions and 32 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -104,15 +104,7 @@ jobs:
         fail_ci_if_error: false
 
   test-long-algos:
-<<<<<<< HEAD
-<<<<<<< HEAD
-    needs: pretest, pre-commit
-=======
-    needs: pre-commit, pretest
->>>>>>> Pre-commit as parallel step to pretest
-=======
     needs: [pre-commit, pretest]
->>>>>>> Fix missing brackets
     runs-on: ${{ matrix.platform }}
     strategy:
       matrix:
@@ -146,15 +138,7 @@ jobs:
         fail_ci_if_error: false
 
   test_no_extras:
-<<<<<<< HEAD
-<<<<<<< HEAD
-    needs: pre-commit
-=======
-    needs: pre-commit, pretest
->>>>>>> Pre-commit as parallel step to pretest
-=======
     needs: [pre-commit, pretest]
->>>>>>> Fix missing brackets
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
@@ -177,15 +161,7 @@ jobs:
         name: codecov-umbrella
         fail_ci_if_error: false
   mongodb:
-<<<<<<< HEAD
-<<<<<<< HEAD
-    needs: pre-commit
-=======
-    needs: pre-commit, pretest
->>>>>>> Pre-commit as parallel step to pretest
-=======
     needs: [pre-commit, pretest]
->>>>>>> Fix missing brackets
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
@@ -214,15 +190,7 @@ jobs:
           name: codecov-umbrella
           fail_ci_if_error: false
   backward-compatibility:
-<<<<<<< HEAD
-<<<<<<< HEAD
-    needs: pre-commit
-=======
-    needs: pre-commit, pretest
->>>>>>> Pre-commit as parallel step to pretest
-=======
     needs: [pre-commit, pretest]
->>>>>>> Fix missing brackets
     runs-on: ubuntu-latest
     strategy:
       max-parallel: 2