From 346e3245f30a6e8b73d993d4c0a487a2d089ae2f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 16 Nov 2026 09:29:39 +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 c9e59e3343d4de76403395b542387f1916c17d81) --- src/hotfix-conflict-43838252361-1.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/hotfix-conflict-43838252361-1.txt b/src/hotfix-conflict-43838252361-1.txt index 1f5e3cab2..5a4372655 100644 --- a/src/hotfix-conflict-43838252361-1.txt +++ b/src/hotfix-conflict-43838252361-1.txt @@ -1 +1,5 @@ +<<<<<<< HEAD recorded base side of the conflict +======= +trunk side of the conflict +>>>>>>> c9e59e33 (fix: trunk patch that conflicts on env/test)