fix: resolve merge conflict markers in mcp-ssh + schema (PR #240 merge artifact) #241

Merged

clawdie merged 1 commit from hotfix/merge-conflict-markers into main

2026-06-27 21:32:06 +02:00

Author	SHA1	Message	Date
Sam & Claude	3becc6c190	fix: resolve merge conflict markers in mcp-ssh + schema (PR #240 merge artifact) Some checks failed CI / rust (pull_request) Has been cancelled Details CI / markdown (pull_request) Has been cancelled Details CI / port (pull_request) Has been cancelled Details CI / agent-jail-pkgs (pull_request) Has been cancelled Details Two files had unresolved <<<<<<< HEAD / >>>>>>> markers committed to main: - colibri-mcp-ssh: resolved to JSON proof_text example + screenshot_uuid - mother_schema.sql: resolved to both columns (proof_text + screenshot_uuid)	2026-06-27 21:30:08 +02:00