Skip to content

Commit 6984a75

Browse files
author
Stack Demo
committed
testdata: seed sandbox trunk drift
1 parent 74d5552 commit 6984a75

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

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: 44caee2
4+
marker: 74d5552

0 commit comments

Comments
 (0)