From f6975d8fedf7ad4969f0d3798b2d22ee4c7fdb8d Mon Sep 17 00:00:00 2001
From: Joshua Temple <joshua.temple@stablekernel.com>
Date: Thu, 25 Jun 2026 18:33:31 -0400
Subject: [PATCH] fix: trunk patch that conflicts on env/test (#343)

Signed-off-by: cascade-validation <cascade-validation@users.noreply.github.com>
Co-authored-by: cascade-validation <cascade-validation@users.noreply.github.com>
(cherry picked from commit 11a87403cb35aa837a4caa3fdb037d4b5864df8c)
---
 src/hotfix-conflict-28203447808-1.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/hotfix-conflict-28203447808-1.txt

diff --git a/src/hotfix-conflict-28203447808-1.txt b/src/hotfix-conflict-28203447808-1.txt
new file mode 100644
index 00000000..1ce13764
--- /dev/null
+++ b/src/hotfix-conflict-28203447808-1.txt
@@ -0,0 +1 @@
+trunk side of the conflict