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

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