From 73eaa17b809adb0ea4949eafde0bc11568fca38d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2026 09:32:49 +0000
Subject: [PATCH] fix: trunk patch that conflicts on env/test

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 74569c2898622e38f84a397b39c0423e820b6a51)
---
 src/hotfix-conflict-38541383284-1.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/hotfix-conflict-38541383284-1.txt b/src/hotfix-conflict-38541383284-1.txt
index 1f5e3cab..b4b894b2 100644
--- a/src/hotfix-conflict-38541383284-1.txt
+++ b/src/hotfix-conflict-38541383284-1.txt
@@ -1 +1,5 @@
+<<<<<<< HEAD
 recorded base side of the conflict
+=======
+trunk side of the conflict
+>>>>>>> 74569c28 (fix: trunk patch that conflicts on env/test)