From 4c4e328ad4beab00afc252629bc9d48fb315b9e0 Mon Sep 17 00:00:00 2001 From: Dimitri Kennedy Date: Wed, 25 Mar 2026 14:51:45 -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 a1cfdc3..cd88a86 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: bd5bf7e +marker: 398f525