Skip to content

Commit 7df5de5

Browse files
committed
Fix incorrectly resolved merge conflict
Signed-off-by: Michael Herger <michael@herger.net>
1 parent 4fd7ede commit 7df5de5

1 file changed

Lines changed: 0 additions & 1 deletion

File tree

.github/actions/build/action.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ runs:
146146
continue-on-error: true
147147
uses: ./server/.github/actions/setup-s5cmd
148148
# uses: peak/action-setup-s5cmd@main
149-
continue-on-error: true
150149
with:
151150
version: v2.3.0
152151

0 commit comments

Comments
 (0)