Closed Fryguy closed 1 year ago
**
@Fryguy A conflict occurred during the backport of this pull request to petrosian
.
If this pull request is based on another pull request that has not been marked for backport, add the appropriate labels to the other pull request. Otherwise, please create a new pull request direct to the petrosian
branch in order to resolve this.
Conflict details:
There is no conflict, I just happened to Ctrl-C at the wrong time in the backport sequence.
petrosian
backport details:
commit 83d721e9d13c4d53ea4edbc6d7245f046370382c (HEAD -> petrosian, origin/petrosian)
Author: Brandon Dunne <brandondunne@hotmail.com>
Date: Wed Jun 14 15:50:33 2023 -0400
Merge pull request #97 from Fryguy/workflow_dispatch
Allow workflow_dispatch GHA event
(cherry picked from commit 6597500d45dbee24915d3f39f0edd292d858e5ae)
@bdunne Please review.