From b867c77b74de19094699fa07f5f7036c79a642bc Mon Sep 17 00:00:00 2001 From: Dimitri Kennedy Date: Wed, 25 Mar 2026 14:53:43 -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 cd88a86..f53ef9b 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: 398f525 +marker: 44caee2