missed merge conflict

FyshOS · Jan 18, 2024 · 2e11f63 · 2e11f63
1 parent 005ce96
commit 2e11f63
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml
@@ -39,7 +39,3 @@ jobs:
 
     - name: Staticcheck
       run: staticcheck -go 1.19 ./...
-<<<<<<< HEAD
-
-=======
->>>>>>> ca3bca0c40a833df8ac3a90b0d2021eb2304646b