Merge remote-tracking branch 'refs/remotes/origin/master'

2025-05-25 13:58:09 -04:00 · 2025-05-25 13:58:09 -04:00 · 81028fc049
commit 81028fc049
parent 725503c0d0 745ffbe7ea
2 changed files with 4 additions and 0 deletions
--- a/.forgejo/workflows/build.yaml
+++ b/.forgejo/workflows/build.yaml
@ -1,6 +1,10 @@
 on: [push]
 jobs:
  test:
+<<<<<<< HEAD
    runs-on: docker
+=======
+    runs-on: minecrap
+>>>>>>> refs/remotes/origin/master
    steps:
      - run: echo All Good