Resolve merge conflict into staging from master#5840
Open
michelinewu wants to merge 6 commits intostagingfrom
Open
Resolve merge conflict into staging from master#5840michelinewu wants to merge 6 commits intostagingfrom
michelinewu wants to merge 6 commits intostagingfrom
Conversation
* Add display toggles to editor display header. * Remove display toggles from scene selector. * Only show display toggles in dual output mode. * Fixes for dual output tests. * Fixes for multistream and dual output tests. * Fix multistream go live tests. * Dual Output test fixes. * More fixes for dual output and multistream tests. * Fix dual output non-ultra test.
* Enable/disable performance mode with display toggles. * Fix prettier error.
Co-authored-by: gettinToasty <sbeyer@logitech.com>
…ts. (#5839) * Remove default encoders checks in multistream tests. * Dual Output test fixes.
sandboxcoder
approved these changes
Apr 10, 2026
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Conflict from merging PRs 5830 and 5839(#5839).
Issue was between this line on master and this line on staging. Factory API test on staging checks for the second signal from the vertical stream ending.