From 2f4f0777bc8033726b9166fd5f43a7231cb4d0cd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 16 Nov 2026 09:25:06 +0000 Subject: [PATCH] fix: seed recorded base content for hotfix conflict Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- src/hotfix-conflict-43838252361-1.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/hotfix-conflict-43838252361-1.txt diff --git a/src/hotfix-conflict-43838252361-1.txt b/src/hotfix-conflict-43838252361-1.txt new file mode 100644 index 000000000..1f5e3cab2 --- /dev/null +++ b/src/hotfix-conflict-43838252361-1.txt @@ -0,0 +1 @@ +recorded base side of the conflict