From 4dcf34a805b0b16dc5f9a2701fe0473c58dce911 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 1 Aug 2026 09:55:01 +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 c3619dfeac002e749516cbfede68566ceaba5b05)
---
 src/hotfix-conflict-30694289733-1.txt | 4 ++++
 1 file changed, 4 insertions(+)

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