From 068d2273e77f152c86dc315e5c2ee0e9b5e90b90 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 15 Jul 2026 09:47:36 +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 1a303921d9bbcd2822ad156e8079eba4fb926eee)
---
 src/hotfix-conflict-29405128811-1.txt | 4 ++++
 1 file changed, 4 insertions(+)

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