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

This commit is contained in:
Nick Martin 2025-05-25 13:58:09 -04:00
commit 81028fc049
2 changed files with 4 additions and 0 deletions

View file

View file

@ -1,6 +1,10 @@
on: [push]
jobs:
test:
<<<<<<< HEAD
runs-on: docker
=======
runs-on: minecrap
>>>>>>> refs/remotes/origin/master
steps:
- run: echo All Good