fix ci

Author: timzaak

.github/workflows/spa-client-build.yml

@@ -14,11 +14,7 @@ jobs:
             target: x86_64-unknown-linux-musl
             name: spa-client-linux-musl-x86_64
             command: make release-linux-client-musl
-<<<<<<< HEAD
-          - os: macos-12
-=======
           - os: macos-13
->>>>>>> develop_3_0_1
             target: x86_64-apple-darwin
             name: spa-client-macos-x86_64
             command: make release-client-mac