From c0cca6c3488f4233bc2f81f4eefd75ae74588c9d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 2 Jul 2026 10:38:18 +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 e28b82a7c81ec7d5ff40ada16ed5e9440757a2e6)
---
 src/hotfix-conflict-28581757296-1.txt | 4 ++++
 1 file changed, 4 insertions(+)

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