Closed GuySartorelli closed 3 months ago
There's a merge conflict when merging up from the 6.0 branch to the 6 branch: https://github.com/tractorcow-farm/silverstripe-fluent/actions/runs/9215217318/job/25353105899 I lack the required level of access to push directly to the 6 branch, so the only way I can resolve it is with a PR.
6.0
6
There's a merge conflict when merging up from the
6.0branch to the6branch: https://github.com/tractorcow-farm/silverstripe-fluent/actions/runs/9215217318/job/25353105899 I lack the required level of access to push directly to the 6 branch, so the only way I can resolve it is with a PR.NOTE: DO NO SQUASH
Issue