Merge remote-tracking branch 'refs/remotes/origin/mistress' into mistress
This commit is contained in:
commit
58a8520f06
1 changed files with 4 additions and 0 deletions
|
@ -6,6 +6,10 @@ on:
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
runs-on: docker
|
runs-on: docker
|
||||||
|
<<<<<<< HEAD
|
||||||
container: node:latest
|
container: node:latest
|
||||||
|
=======
|
||||||
|
uses: alpine:latest
|
||||||
|
>>>>>>> refs/remotes/origin/mistress
|
||||||
steps:
|
steps:
|
||||||
- run: echo All Good
|
- run: echo All Good
|
Loading…
Add table
Reference in a new issue