Nick TrochalakisandCursor Agent 5aa5fef9af Fix Dockerfile conflict markers broken on main (#3) ...

* 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.

* Add CI check that fails on merge conflict markers

* Narrow conflict-marker CI check to <<<<<<< and >>>>>>>

---------

Co-authored-by: Cursor Agent <[email protected]>

2026-08-23 23:32:54 +00:00

..

ci.yml

Fix Dockerfile conflict markers broken on main (#3)

2026-08-23 23:32:54 +00:00