Compare commits
No commits in common. "81028fc049b353ffa9274b409c73df08645c2c94" and "745ffbe7ea954bf6e84a67962bf500150cddba46" have entirely different histories.
81028fc049
...
745ffbe7ea
2 changed files with 0 additions and 4 deletions
|
@ -1,10 +1,6 @@
|
||||||
on: [push]
|
on: [push]
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
<<<<<<< HEAD
|
|
||||||
runs-on: docker
|
|
||||||
=======
|
|
||||||
runs-on: minecrap
|
runs-on: minecrap
|
||||||
>>>>>>> refs/remotes/origin/master
|
|
||||||
steps:
|
steps:
|
||||||
- run: echo All Good
|
- run: echo All Good
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue