From e6f1652fea577062a2c62b0a4168bedbd884bf3e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 29 Oct 2026 09:26:55 +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>
---
 src/hotfix-conflict-40847998156-1.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotfix-conflict-40847998156-1.txt b/src/hotfix-conflict-40847998156-1.txt
index 8b9eb2bab..1ce13764e 100644
--- a/src/hotfix-conflict-40847998156-1.txt
+++ b/src/hotfix-conflict-40847998156-1.txt
@@ -1 +1 @@
-trunk drift ahead of the hotfix fix
+trunk side of the conflict