Compare commits

..

No commits in common. "81028fc049" and "745ffbe7ea" have entirely different histories.

2 changed files with 0 additions and 4 deletions

View file

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