From c7c5de1b265ef827fd413c357233c769c437eac9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 21 Jul 2026 10:05:13 +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 2a9e4d14610411fb76c4f064e41a9c7b41d1e79e)
---
 src/hotfix-conflict-29820102956-1.txt | 4 ++++
 1 file changed, 4 insertions(+)

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