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