From 9c041a147a04b326477bbdef4602deaaf548a7e8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 24 Jul 2026 14:06:12 +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 79c076cbc198d46d6730722b3078931bfc1693f8)
---
 src/hotfix-conflict-30097062851-1.txt | 4 ++++
 1 file changed, 4 insertions(+)

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