fixed main.yml

bhklab · May 19, 2024 · 560272f · 560272f
1 parent 535a1c5
commit 560272f
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,9 +17,6 @@ jobs:
 
   tests:
     runs-on: ${{ matrix.os }}
-<<<<<<< Updated upstream
-    timeout-minutes: 15 # Consider increasing timeout
-=======
     timeout-minutes: 15
 
     strategy: