From 46cd45f922dd74d8caa109f270efa3ec845d5f61 Mon Sep 17 00:00:00 2001 From: Dave Date: Mon, 23 Feb 2026 23:08:52 +0000 Subject: [PATCH] story-kit: start 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/{1_upcoming => 2_current}/119_story_mergemaster_should_resolve_merge_conflicts_instead_of_leaving_conflict_markers_on_master.md (100%) diff --git a/.story_kit/work/1_upcoming/119_story_mergemaster_should_resolve_merge_conflicts_instead_of_leaving_conflict_markers_on_master.md b/.story_kit/work/2_current/119_story_mergemaster_should_resolve_merge_conflicts_instead_of_leaving_conflict_markers_on_master.md similarity index 100% rename from .story_kit/work/1_upcoming/119_story_mergemaster_should_resolve_merge_conflicts_instead_of_leaving_conflict_markers_on_master.md rename to .story_kit/work/2_current/119_story_mergemaster_should_resolve_merge_conflicts_instead_of_leaving_conflict_markers_on_master.md