From 6b95731ffe90660bb6a79ced547b74b68745bed2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 5 Nov 2026 09:22:05 +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-42000446756-1.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/hotfix-conflict-42000446756-1.txt

diff --git a/src/hotfix-conflict-42000446756-1.txt b/src/hotfix-conflict-42000446756-1.txt
new file mode 100644
index 000000000..1f5e3cab2
--- /dev/null
+++ b/src/hotfix-conflict-42000446756-1.txt
@@ -0,0 +1 @@
+recorded base side of the conflict