From 046f25ed5b59fb12a848f2e040dc3719814f945e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 5 Nov 2026 09:30:47 +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 4bdbc61e77eb87fb968daeed29a1f97bda7a5248)
---
 src/hotfix-conflict-42000446756-1.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/hotfix-conflict-42000446756-1.txt b/src/hotfix-conflict-42000446756-1.txt
index 1f5e3cab2..3c4afa6f4 100644
--- a/src/hotfix-conflict-42000446756-1.txt
+++ b/src/hotfix-conflict-42000446756-1.txt
@@ -1 +1,5 @@
+<<<<<<< HEAD
 recorded base side of the conflict
+=======
+trunk side of the conflict
+>>>>>>> 4bdbc61e (fix: trunk patch that conflicts on env/test)