c-thiel
diff --git a/‎.github/workflows/ci.yml
Copy file name to clipboardExpand all lines: .github/workflows/ci.yml
-4Lines changed: 0 additions & 4 deletions b/‎.github/workflows/ci.yml
Copy file name to clipboardExpand all lines: .github/workflows/ci.yml
-4Lines changed: 0 additions & 4 deletions
@@ -51,11 +51,7 @@ jobs:
       - name: Install cargo-llvm-cov
         uses: taiki-e/install-action@main
         with:
-<<<<<<< Updated upstream
           tool: cargo-llvm-cov
-=======
-          tool: grcov
->>>>>>> Stashed changes
 
       - name: Tests
         if: ${{ !startsWith(matrix.os, 'ubuntu-') }}