From 8d854ec9fad2004f71fc1ddb44a5f940c243a541 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 30 Jul 2026 10:07:00 +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 c21b45cb9e53688ecadbfb9d1c9f426517316b01)
---
 src/hotfix-conflict-30532532223-1.txt | 4 ++++
 1 file changed, 4 insertions(+)

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