Skip to content

Commit 66b80df

Browse files
committed
f: fix action
1 parent 798a35d commit 66b80df

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

.github/workflows/build.yml

-8
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@ jobs:
1616
- uses: taiki-e/create-gh-release-action@v1
1717
with:
1818
# (optional) Path to changelog.
19-
<<<<<<< HEAD
2019
# changelog: CHANGELOG.md
21-
=======
22-
changelog: CHANGELOG.md
23-
>>>>>>> d13247f479d853832f107b1db5963787494deffc
2420
# (required) GitHub token for creating GitHub Releases.
2521
token: ${{ secrets.GITHUB_TOKEN }}
2622

@@ -42,11 +38,7 @@ jobs:
4238
with:
4339
# (required) Comma-separated list of binary names (non-extension portion of filename) to build and upload.
4440
# Note that glob pattern is not supported yet.
45-
<<<<<<< HEAD
4641
bin: rae-cli
47-
=======
48-
bin: ...
49-
>>>>>>> d13247f479d853832f107b1db5963787494deffc
5042
# (optional) Target triple, default is host triple.
5143
# This is optional but it is recommended that this always be set to
5244
# clarify which target you are building for if macOS is included in

0 commit comments

Comments
 (0)