596b5fe5e8
Some checks are pending
build-gate / build (push) Waiting to run
The rebase conflicted in nine public/ files — build OUTPUT, not source. Neither side of such a conflict is authoritative, so the resolution is to rebuild rather than hand-pick hunks: these nine differ from what the manual resolution produced, which is precisely why the rebuild was required before pushing. No source file conflicted except package.json, where upstream had added check:maplibre-drops and this branch check:packets-all. Both are kept, and gates:post is upstream's 20 steps plus this branch's one addition — not either side's version of the list. |
||
|---|---|---|
| .. | ||
| __gallery | ||
| assets | ||
| doxa-maps | ||
| .gitignore | ||
| index.html | ||