Fix merge conflict resolution error in request-queuing/ui.spec.js, for v12.1.0#26476
Merged
Gudahtt merged 3 commits intoVersion-v12.1.0from Aug 22, 2024
Merged
Fix merge conflict resolution error in request-queuing/ui.spec.js, for v12.1.0#26476Gudahtt merged 3 commits intoVersion-v12.1.0from
Gudahtt merged 3 commits intoVersion-v12.1.0from
Conversation
Contributor
|
CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes. |
Collaborator
Builds ready [dd2194f]
Page Load Metrics (245 ± 254 ms)
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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 brings the tests up to date with develop, which is what they should have been. One test that was cherry-picked into v12.0.0 and then later updated on develop was not merge properly when master was merged into v12.1.0