story-kit: accept 119_story_mergemaster_should_resolve_merge_conflicts_instead_of_leaving_conflict_markers_on_master

Browse Source

...

This commit is contained in:

Dave

2026-02-23 23:23:37 +00:00

parent b928eace9c

commit 69bff2d4bc

1 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

.story_kit/work/4_merge/119_story_mergemaster_should_resolve_merge_conflicts_instead_of_leaving_conflict_markers_on_master.md → .story_kit/work/5_archived/119_story_mergemaster_should_resolve_merge_conflicts_instead_of_leaving_conflict_markers_on_master.md