From f2b4ec59feff5b57357ae117365207d9d4c9ca4e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Aug 2026 09:24:11 +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-32467090935-1.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/hotfix-conflict-32467090935-1.txt diff --git a/src/hotfix-conflict-32467090935-1.txt b/src/hotfix-conflict-32467090935-1.txt new file mode 100644 index 00000000..1f5e3cab --- /dev/null +++ b/src/hotfix-conflict-32467090935-1.txt @@ -0,0 +1 @@ +recorded base side of the conflict