From 75ba78b140e804939b31e5ab408efcae9e2c2d54 Mon Sep 17 00:00:00 2001 From: Dimitri Kennedy Date: Thu, 26 Mar 2026 14:28:38 -0400 Subject: [PATCH] testdata: seed sandbox conflict child --- _test_data/sandbox/conflict/shared.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_test_data/sandbox/conflict/shared.txt b/_test_data/sandbox/conflict/shared.txt index ea16f16..bbf9277 100644 --- a/_test_data/sandbox/conflict/shared.txt +++ b/_test_data/sandbox/conflict/shared.txt @@ -1,4 +1,4 @@ conflict scenario -owner: sandbox-conflict-base -resolution: parent branch version -marker: 00e3fde +owner: sandbox-conflict-child +resolution: child branch version +marker: 985bb77