Files
storkit/.story_kit/work/4_merge
Dave f4366ba644 fix: resolve merge conflict markers left on master from story-115 merge
The squash-merge of story-115 (hot-reload project.toml agent config) left
unresolved conflict markers in client.ts and Chat.tsx where reconciliation_progress
code from master collided with agent_config_changed additions. Both features
are retained.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-23 23:07:00 +00:00
..