From 7bd5dd6b50999ad46fb8d18b75724107f08f3d61 Mon Sep 17 00:00:00 2001
From: Kaalleen <reni@allenka.de>
Date: Fri, 18 Feb 2022 18:55:25 +0100
Subject: [PATCH] test with macos python 3.8.x

---
 .github/workflows/build.yml | 2 +-
 bin/build-python            | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 74fe8f6bf..44a686436 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -143,7 +143,7 @@ jobs:
           submodules: recursive
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.9.x'
+          python-version: '3.8.x'
       - uses: actions/setup-node@v1
         with:
           node-version: '16.x'
diff --git a/bin/build-python b/bin/build-python
index 3cc3139bd..195248c34 100755
--- a/bin/build-python
+++ b/bin/build-python
@@ -38,13 +38,7 @@ pyinstaller_args+="--log-level DEBUG "
 # This adds bundle identifier in reverse DSN format for macos
 if [ "$BUILD" = "osx" ]; then
     pyinstaller_args+="--osx-bundle-identifier org.inkstitch.app "
-<<<<<<< HEAD
     pyinstaller_args+="-i electron/build/icons/mac/inkstitch.icns"
-=======
-    # in macOS we get an error when building libgfortran: incompatible with target arch x86_64 (has arch: arm64)!
-    # let's try if this fixes it
-    pyinstaller_args+="--target-arch x86_64 "
->>>>>>> bcf63fec (test to build with specified arch (macOS))
     if [[ -z ${GITHUB_REF} ]]; then
         echo "Dev or Local Build"
     else