From d88ae57a4b05e0f711eac71dec52b073acda13cb Mon Sep 17 00:00:00 2001 From: Dan Webb Date: Mon, 15 Jun 2026 16:35:38 +0100 Subject: [PATCH] fix: repair workflow actionlint failures --- .github/workflows/release.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 010f762..dae181a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,11 +16,7 @@ permissions: jobs: release: -<<<<<<< HEAD uses: sous-chefs/.github/.github/workflows/release-cookbook.yml@8.0.2 -======= - uses: sous-chefs/.github/.github/workflows/release-cookbook.yml@8.0.2 ->>>>>>> 8a5769f (ci: bump release workflow to 6.0.0) secrets: token: ${{ secrets.PORTER_GITHUB_TOKEN }} supermarket_user: ${{ secrets.CHEF_SUPERMARKET_USER }}