[SITE-1585] address diffs after rebase #147
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR re-applies fixes from the backed-up copy of WPCM onto files that were changed the wrong way after the rebase.
While this PR doesn't actually address anything related to SITE-1585, rebasing the entire repository on the
pantheon-upstreams
repo, the "fix" was rebasing the repository onpantheon-usptreams/main
and this fixes files that were adversely affected by the rebase (honestly surprising more didn't break).