Resolves merge conflicts: - Verifier.php: keep parent (CONCAT fix, fetch-then-map pattern) - ticket/detail.html, verifier/list.html, verifier/save.html: stage as-is (no conflict markers) |
||
|---|---|---|
| .. | ||
| vr_ticket | ||
| index.html | ||
Resolves merge conflicts: - Verifier.php: keep parent (CONCAT fix, fetch-then-map pattern) - ticket/detail.html, verifier/list.html, verifier/save.html: stage as-is (no conflict markers) |
||
|---|---|---|
| .. | ||
| vr_ticket | ||
| index.html | ||