From 118b8f8545e7c010088614d5de823d2d11c376fa Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 10 Nov 2026 09:23:15 +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 a1c878c5b5734b02f28dc79a5fa9177adfbbc87d)
---
 src/hotfix-conflict-42788671368-1.txt | 4 ++++
 1 file changed, 4 insertions(+)

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