From 2005fa169dbab5cc6712820d209a61e3f3230672 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 7 Oct 2026 09:35:24 +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 df72d60cc1be63c1186459a099e4d02f3b1968c5)
---
 src/hotfix-conflict-37599945653-1.txt | 4 ++++
 1 file changed, 4 insertions(+)

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