From c75b7feb2b6f2190b1828a63a86ec4cd2be1664e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 31 Aug 2026 09:36:30 +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 899b0fbfdbc25e11d338a6219de56f0f30ac24c6)
---
 src/hotfix-conflict-33377422683-1.txt | 4 ++++
 1 file changed, 4 insertions(+)

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