From 179945b859fbb2e74f2fe9a135e800a2a4dc6ba1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 24 Sep 2026 09:29:52 +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 e829d0a3a66228a6cf6487c455eb1a4c18090255)
---
 src/hotfix-conflict-35980470289-1.txt | 4 ++++
 1 file changed, 4 insertions(+)

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