From 113e51dbf356f7c2aec55d6b5f0908fa8d348c0c Mon Sep 17 00:00:00 2001 From: Marcel van der Veldt Date: Mon, 28 Oct 2024 12:58:57 +0100 Subject: [PATCH] Chore: Fix config --- .github/workflows/release-drafter-stable.yml | 5 ----- .github/workflows/release-please-dev.yml | 5 ----- 2 files changed, 10 deletions(-) diff --git a/.github/workflows/release-drafter-stable.yml b/.github/workflows/release-drafter-stable.yml index bdb4818f..694987f8 100644 --- a/.github/workflows/release-drafter-stable.yml +++ b/.github/workflows/release-drafter-stable.yml @@ -20,10 +20,5 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} release-type: simple -<<<<<<< Updated upstream - manifest-file: .release-please-manifest-stable.json - config-file: .release-please-config-stable.json -======= manifest-file: .github/workflows/.release-please-manifest-stable.json config-file: .github/workflows/.release-please-config-stable.json ->>>>>>> Stashed changes diff --git a/.github/workflows/release-please-dev.yml b/.github/workflows/release-please-dev.yml index 067760ac..39b62ec6 100644 --- a/.github/workflows/release-please-dev.yml +++ b/.github/workflows/release-please-dev.yml @@ -21,10 +21,5 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} release-type: simple -<<<<<<< Updated upstream - manifest-file: .release-please-manifest-dev.json - config-file: .release-please-config-dev.json -======= manifest-file: .github/workflows/.release-please-manifest-dev.json config-file: .github/workflows/.release-please-config-dev.json ->>>>>>> Stashed changes -- 2.34.1