Fix forgotten git conflict (#2)

Author: howetuft

.github/workflows/build_bundle.yml

@@ -67,8 +67,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: "BlendLuxCore"
-<<<<<<< HEAD
           path: "${{ github.workspace }}/build/out/BlendLuxCore-*.zip"
-=======
-          path: "${{ github.workspace }}/build/BlendLuxCore-*.zip"
->>>>>>> 9c294874 (Build bundle workflow: add worflow_dispatch)