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

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