From b81d3eb19813607d4d0ea467e4c1fa8ff9ce57b2 Mon Sep 17 00:00:00 2001
From: littlecodedragon <253116839+littlecodedragon@users.noreply.github.com>
Date: Sat, 9 May 2026 20:05:53 +0200
Subject: [PATCH] CI: resolve merge conflict markers in build_release.yml

Invalid YAML from leftover <<<<<<< / ======= / >>>>>>> markers broke
Forgejo Actions parsing. Keep fork delta, full changelog link, and tip block.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .forgejo/workflows/build_release.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.forgejo/workflows/build_release.yml b/.forgejo/workflows/build_release.yml
index 6263f32da..f500d40da 100755
--- a/.forgejo/workflows/build_release.yml
+++ b/.forgejo/workflows/build_release.yml
@@ -402,9 +402,6 @@ jobs:
             "- Assets use stable names for Obtainium compatibility." \
             "- Versioned files follow: \`Komikku-v<version>-<abi>.apk\`." \
             "" \
-<<<<<<< HEAD
-            "${full_changelog}")"
-=======
             "${fork_delta_label}" \
             "" \
             "${full_changelog}" \
@@ -413,7 +410,6 @@ jobs:
             "> [!TIP]" \
             ">" \
             "> ### If you are unsure which version to download then go with \`Komikku-universal.apk\`")"
->>>>>>> c31f3fb7b8 (Release: use fork update source and upstream-based changelog delta)
 
           "${JQ_BIN}" -n \
             --arg tag "${VERSION_TAG}" \