Chore: Fix config

diff --git a/.github/workflows/release-drafter-stable.yml b/.github/workflows/release-drafter-stable.yml
index bdb4818f8ac0c09201e3212ffe3634485e8d30a3..694987f829cefa55dad0165d1160f95c73f9bbe1 100644 (file)
--- 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 067760acdee89726b180f4413cac2c9bbcfdef16..39b62ec6e4ee31696f829d163456bf734f3f0f3c 100644 (file)
--- 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