Fix CI

eldruin · Jan 23, 2024 · 9cc7956 · 9cc7956
1 parent 5cd3613
commit 9cc7956
Showing 1 changed file with 1 addition and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -58,26 +58,12 @@ jobs:
   clippy:
     name: Clippy
     runs-on: ubuntu-latest
-<<<<<<< HEAD
-    strategy:
-      matrix:
-        rust: [1.60.0]
-        TARGET:
-          - x86_64-unknown-linux-gnu
-||||||| parent of 25424bf... Update CI
-    strategy:
-      matrix:
-        rust: [1.52.1]
-        TARGET:
-          - x86_64-unknown-linux-gnu
-=======
->>>>>>> 25424bf... Update CI
 
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.73.0
+          toolchain: 1.75.0
           targets: x86_64-unknown-linux-gnu
           components: clippy