Skip to content

Commit 4c4e328

Browse files
roodboiroodboi
committed
testdata: seed sandbox trunk drift
1 parent 398f525 commit 4c4e328

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

‎_test_data/sandbox/conflict/shared.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
conflict scenario
22
owner: sandbox-trunk-drift
33
resolution: trunk drift version
4-
marker: bd5bf7e
4+
marker: 398f525

0 commit comments

Comments
 (0)