From 69bff2d4bc45e43b8155047176e33803505c3c83 Mon Sep 17 00:00:00 2001 From: Dave Date: Mon, 23 Feb 2026 23:23:37 +0000 Subject: [PATCH] story-kit: accept 119_story_mergemaster_should_resolve_merge_conflicts_instead_of_leaving_conflict_markers_on_master --- ...rge_conflicts_instead_of_leaving_conflict_markers_on_master.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .story_kit/work/{4_merge => 5_archived}/119_story_mergemaster_should_resolve_merge_conflicts_instead_of_leaving_conflict_markers_on_master.md (100%) diff --git a/.story_kit/work/4_merge/119_story_mergemaster_should_resolve_merge_conflicts_instead_of_leaving_conflict_markers_on_master.md b/.story_kit/work/5_archived/119_story_mergemaster_should_resolve_merge_conflicts_instead_of_leaving_conflict_markers_on_master.md similarity index 100% rename from .story_kit/work/4_merge/119_story_mergemaster_should_resolve_merge_conflicts_instead_of_leaving_conflict_markers_on_master.md rename to .story_kit/work/5_archived/119_story_mergemaster_should_resolve_merge_conflicts_instead_of_leaving_conflict_markers_on_master.md