Fix merge conflicts

This commit is contained in:
Matthew Sevey 2022-05-27 09:35:19 -04:00
parent b5c2d4cda8
commit d459a7eab5
No known key found for this signature in database
GPG Key ID: 9ADDD344F13057F6
1 changed files with 0 additions and 2 deletions

View File

@ -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