Fix git error

srlabs · Nov 4, 2024 · 402cfba · 402cfba
1 parent c9b8567
commit 402cfba
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,10 +32,7 @@ jobs:
       - run: sudo apt-get update
       - run: sudo apt-get install binutils-dev libunwind-dev gnuplot
       - run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
-<<<<<<< Updated upstream
       - run: rustup component add rust-src
-=======
->>>>>>> Stashed changes
       - run: cargo install cargo-afl honggfuzz grcov
       - run: cargo install --path . --verbose
       - run: cargo test --verbose -- --show-output