fix CI (bad rebase)

camfort · Feb 1, 2022 · d5c8ba2 · d5c8ba2
1 parent f427773
commit d5c8ba2
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,7 +37,6 @@ jobs:
     - name: Build and run tests
       run: stack --no-terminal haddock --test --no-haddock-deps --pedantic
 
-<<<<<<< HEAD
     - name: Install (to place executable at a known location)
       run: stack --no-terminal install
 
@@ -52,11 +51,6 @@ jobs:
     runs-on: ubuntu-latest
     name: Ubuntu / GHC ${{ matrix.ghc }}, Cabal / test
 
-=======
-  ubuntu-cabal-test:
-    runs-on: ubuntu-latest
-    name: Ubuntu / GHC ${{ matrix.ghc }}, Cabal ${{ matrix.cabal }} / test
->>>>>>> b360279 (add CI job for running benchmarks)
     strategy:
       fail-fast: false      # don't stop if one job (= GHC version) fails
       matrix: