From ad5bbab1ccc249f1418c89eeb986f9b16a90674a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 3 Jul 2026 10:34:50 +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 9677110bbb3750877210f0f2d7c0f75836a4236f)
---
 src/hotfix-conflict-28653239795-1.txt | 4 ++++
 1 file changed, 4 insertions(+)

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