From 73ea76e631820bb19652a0a31153e1099999aba2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 5 Aug 2026 10:08: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 6359b7c94b6bce2c788a63f792cf7b77da07613f)
---
 src/hotfix-conflict-30995337825-1.txt | 4 ++++
 1 file changed, 4 insertions(+)

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