Commit Graph
2 Commits
Author SHA1 Message Date
Cursor Agent f828c7794a Add CI check that fails on merge conflict markers 2026-08-23 23:30:50 +00:00
Cursor Agent b3f8ef9db3 Fix conflict markers on main and guard CI against them
PR #2 merged before the Dockerfile cleanup landed, leaving <<<<<<<
markers that break docker compose build. Restore clean Docker files
and fail CI if conflict markers appear in the tree.
2026-08-23 23:30:43 +00:00