Compare commits

...

2 commits

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