From 1149c50ed977b69c5db7d37f8fdc0959106faf5e Mon Sep 17 00:00:00 2001
From: cochcoder <github.filter194@slmail.me>
Date: Sun, 2 Mar 2025 09:53:05 -0500
Subject: [PATCH] Resolve merge conflicts

---
 .github/workflows/build_all.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml
index e52afe1bb1..93fb4a665d 100644
--- a/.github/workflows/build_all.yml
+++ b/.github/workflows/build_all.yml
@@ -105,7 +105,12 @@ jobs:
         manifest-path: flatpak/io.github.softfever.OrcaSlicer.yml
         cache: true
         arch: ${{ matrix.variant.arch }}
-        upload-artifact: true
+        upload-artifact: false
+    - name: Upload artifacts Flatpak
+      uses: actions/upload-artifact@v4
+      with:
+        name: OrcaSlicer-Linux-flatpak_${{ env.ver }}.flatpak
+        path: '/__w/OrcaSlicer/OrcaSlicer/OrcaSlicer-Linux-flatpak_${{ env.ver }}.flatpak'
     - name: Deploy Flatpak to nightly release
       if: ${{github.ref == 'refs/heads/main'}}
       uses: WebFreak001/deploy-nightly@v3.2.0