From 8e8b5d8ca4d0c816a1c4d857c5ddd8543b33a601 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2026 09:45:55 +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 e4a3077a1a9ac304d4209bb64fffb2da96ced7bc)
---
 src/hotfix-conflict-38230667454-1.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/hotfix-conflict-38230667454-1.txt b/src/hotfix-conflict-38230667454-1.txt
index 1f5e3cab2..13883d0bb 100644
--- a/src/hotfix-conflict-38230667454-1.txt
+++ b/src/hotfix-conflict-38230667454-1.txt
@@ -1 +1,5 @@
+<<<<<<< HEAD
 recorded base side of the conflict
+=======
+trunk side of the conflict
+>>>>>>> e4a3077a (fix: trunk patch that conflicts on env/test)