Skip to content

Commit faa4c58

Browse files
roodboiroodboi
committed
testdata: seed sandbox conflict child
1 parent 7d4a99d commit faa4c58

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

‎_test_data/sandbox/conflict/shared.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
conflict scenario
2-
owner: sandbox-conflict-base
3-
resolution: parent branch version
2+
owner: sandbox-conflict-child
3+
resolution: child branch version

0 commit comments

Comments
 (0)