mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-08 19:56:53 +00:00
Conflicts resolved: - Dockerfile: keep HEAD; filesystem.sh already runs at line 37 and pin_epel() arrived inside centos_mirror.sh, so main's hunk would have run it twice. - peertube 02_fix-application-schema.yml: take main's task name, its expect_rows: true (matching the first query in the same file) and its when: without default(); keep HEAD's changed_when: true, which the notify: compose-up depends on. - peertube check-application/defaults.sql: take main's information_schema query; HEAD's ::regclass cast raises instead of returning no rows when the table is absent. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>