From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Mon, 28 Oct 2024 11:58:57 +0000 (+0100)
Subject: Chore: Fix config
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=113e51dbf356f7c2aec55d6b5f0908fa8d348c0c;p=music-assistant-server.git

Chore: Fix config
---

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