From c4e5e07cb1e2aba7beaf6562306109f1576b4c55 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 10 Oct 2026 09:28:16 +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 15a532e5ecff14bc3d9e9df3f17b689b9f23bb0d)
---
 src/hotfix-conflict-38040839584-1.txt | 4 ++++
 1 file changed, 4 insertions(+)

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