From a710c755d92c688c028866fc52736b72bc85242a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 17 Oct 2026 09:26:49 +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 133e909a3be93046f9daf877adcf5df774e4ce91)
---
 src/hotfix-conflict-39020389665-1.txt | 4 ++++
 1 file changed, 4 insertions(+)

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