MokoConsulting/MokoSuiteBackup

fix: Resolve merge conflict markers in script.php #136

Merged

jmiller merged 1 commits from fix/script-merge-conflicts into main

2026-06-23 18:32:47 +00:00

Author	SHA1	Message	Date
Jonathan Miller	0fbcc861d9	fix: resolve merge conflict markers in script.php Universal: Pre-Release / Build Pre-Release (${{ inputs.stability \|\| github.ref_name }}) (push) Failing after 10s Details Universal: Build & Release / Promote to RC (pull_request) Has been skipped Details Universal: Build & Release / Build & Release Pipeline (pull_request) Successful in 44s Details Joomla: Extension CI / Lint & Validate (pull_request) Failing after 9s Details Joomla: Extension CI / Release Readiness Check (pull_request) Failing after 7s Details Universal: PR Check / Branch Policy (pull_request) Failing after 3s Details Universal: PR Check / Secret Scan (pull_request) Successful in 10s Details Universal: PR Check / Validate PR (pull_request) Failing after 5s Details Joomla: Metadata Validation / Validate Joomla Metadata (pull_request) Successful in 12s Details Generic: Repo Health / Access control (pull_request) Successful in 1s Details Generic: Repo Health / Site Health (pull_request) Has been skipped Details Branch Cleanup / Delete merged branch (pull_request) Successful in 1s Details RC Revert / Rename rc/ back to dev/ (pull_request) Has been skipped Details Universal: Workflow Sync Trigger / Sync workflows to live repos (pull_request) Failing after 3m49s Details Joomla: Extension CI / Tests (PHP 8.2) (pull_request) Has been cancelled Details Joomla: Extension CI / Tests (PHP 8.3) (pull_request) Has been cancelled Details Joomla: Extension CI / PHPStan Analysis (pull_request) Has been cancelled Details Joomla: Extension CI / Build RC Pre-Release (pull_request) Has been cancelled Details Universal: PR Check / Build RC Package (pull_request) Has been cancelled Details Universal: PR Check / Report Issues (pull_request) Has been cancelled Details Generic: Repo Health / Scripts governance (pull_request) Has been cancelled Details Generic: Repo Health / Repository health (pull_request) Has been cancelled Details Generic: Repo Health / Report Issues (pull_request) Has been cancelled Details 12 conflict markers from a stale stash pop were accidentally committed to main in PR #135. Resolved all by keeping the "Updated upstream" blocks which include both error_log() and user-facing enqueueMessage() calls.	2026-06-23 13:32:03 -05:00