diff --git a/.github/workflows/release-libs.yaml b/.github/workflows/release-libs.yaml index ac7883dbaa..b28b8e9bf5 100644 --- a/.github/workflows/release-libs.yaml +++ b/.github/workflows/release-libs.yaml @@ -20,7 +20,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code +<<<<<<< HEAD uses: actions/checkout@v4 +======= + uses: actions/checkout@v3 +>>>>>>> 95c98ba8 (make `dev` up-to-date with `main` (#836)) - name: Run check-versioning-lib-release.sh run: | @@ -30,7 +34,11 @@ jobs: exit 1 fi +<<<<<<< HEAD - uses: actions/checkout@v4 +======= + - uses: actions/checkout@v3 +>>>>>>> 95c98ba8 (make `dev` up-to-date with `main` (#836)) - uses: actions-rs/toolchain@v1 with: toolchain: stable