From 278dc1e9e13732b92c411991d8065311da076c71 Mon Sep 17 00:00:00 2001 From: Dimitri Kennedy Date: Thu, 26 Mar 2026 14:28:42 -0400 Subject: [PATCH] testdata: seed sandbox trunk drift --- _test_data/sandbox/conflict/shared.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_test_data/sandbox/conflict/shared.txt b/_test_data/sandbox/conflict/shared.txt index f53ef9b..c7eeeb2 100644 --- a/_test_data/sandbox/conflict/shared.txt +++ b/_test_data/sandbox/conflict/shared.txt @@ -1,4 +1,4 @@ conflict scenario owner: sandbox-trunk-drift resolution: trunk drift version -marker: 44caee2 +marker: 00e3fde