Merge remote-tracking branch 'refs/remotes/origin/mistress' into mistress

2023-07-06 13:29:29 +02:00 · 2023-07-06 13:29:29 +02:00 · 58a8520f06
commit 58a8520f06
parent f859ce21ad aa4468fa91
1 changed files with 4 additions and 0 deletions
--- a/.forgejo/workflows/release.yaml
+++ b/.forgejo/workflows/release.yaml
@ -6,6 +6,10 @@ on:
 jobs:
  test:
    runs-on: docker
+<<<<<<< HEAD
    container: node:latest
+=======
+    uses: alpine:latest
+>>>>>>> refs/remotes/origin/mistress
    steps:
      - run: echo All Good