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