Skip to content

Commit 255974e

Browse files
committed
2 parents a01ee61 + a71d401 commit 255974e

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

.github/workflows/haxeBuild.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ jobs:
5656
- name: Publish Artifact
5757
uses: actions/upload-artifact@v4
5858
with:
59+
<<<<<<< HEAD:.github/workflows/haxeBuild.yml
5960
name: Solar Submit ${{matrix.os-name}}
6061
path: export/${{matrix.target}}/
62+
=======
63+
name: windowsBuild
64+
path: export/windows/bin
65+
>>>>>>> a71d4013514dbc75c2d9cb9f91136e9ce66b7d86:.github/workflows/build.yml
6166

0 commit comments

Comments
 (0)