From 11a27d207532a2f5be6f209a32dbcd93c81d7eee Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 19 Oct 2026 09:37:01 +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 ecd47b621c2d30c53524703f063e5e1cc5bf420b)
---
 src/hotfix-conflict-39229862617-1.txt | 4 ++++
 1 file changed, 4 insertions(+)

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