From 5ea3d6adf921a4f707157679c73d8307396b0b8b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 18 Sep 2026 09:29: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 8cef90e84a3c7d01a70cabc8a76435eeaaf23843)
---
 src/hotfix-conflict-35328762019-1.txt | 4 ++++
 1 file changed, 4 insertions(+)

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