7edcda368b
Some checks are pending
build-gate / build (push) Waiting to run
The rebase conflicted only in GENERATED output — the built bundle, its SRI hashes, the leaf pages and the manifest — because another agent's work landed in the same files. My two SOURCE files applied cleanly. Resolving generated files by hand would have produced a tree that matches neither agent's source. Taking main's versions and REGENERATING is the only resolution that makes the output a true function of the merged source, so that is what this is: one `vite build` plus `npm run tree` after the rebase. Re-verified after regeneration rather than assumed: check:mfe-two-tab passes on country-posters-mfe and upg-100-mfe alike. |
||
|---|---|---|
| .. | ||
| __gallery | ||
| assets | ||
| doxa-maps | ||
| .gitignore | ||
| index.html | ||