From 0b5532b9928a29c8eaaf172ea3c0a44f67f1f8fe Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 11 Jul 2026 01:01:44 +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 debd3c9b97b3cb1b0cbfcdba8037a93743b48323)
---
 src/hotfix-conflict-29132659555-1.txt | 4 ++++
 1 file changed, 4 insertions(+)

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