From 0dd34002313cb3c6e0c7233b4f44bfb426b675a1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 10 Sep 2026 09:31:29 +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 b45abfb347cef630f468639a6c4924ae3af98fe2)
---
 src/hotfix-conflict-34459875693-1.txt | 4 ++++
 1 file changed, 4 insertions(+)

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