Fix stupid rebase issue

sd2k · Jun 13, 2024 · ab9417b · ab9417b
1 parent 948f5c8
commit ab9417b
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -1,18 +1,9 @@
 name: Rust
 
-<<<<<<< Updated upstream
-on: [push]
-||||||| Stash base
-on:
-  push:
-    branches: [main]
-  pull_request:
-=======
 on:
   push:
     branches: [main, master]
   pull_request:
->>>>>>> Stashed changes
 
 jobs:
   build: