Fix merge conflicts
This commit is contained in:
parent
b5c2d4cda8
commit
d459a7eab5
|
@ -14,8 +14,6 @@ jobs:
|
||||||
matrix:
|
matrix:
|
||||||
dockerfile:
|
dockerfile:
|
||||||
- docker/sia/Dockerfile
|
- docker/sia/Dockerfile
|
||||||
- packages/dashboard-v2/Dockerfile
|
|
||||||
- packages/handshake-api/Dockerfile
|
|
||||||
- packages/health-check/Dockerfile
|
- packages/health-check/Dockerfile
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
|
|
Reference in New Issue