From 81eefdb927c7a3e7b97bea26941f1d3872025eee Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 3 Oct 2026 09:27:53 +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 86e87033ff589a1e9ab72f68b950f09565e43531)
---
 src/hotfix-conflict-37112498629-1.txt | 4 ++++
 1 file changed, 4 insertions(+)

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