fix(upscaling): guard OpenComposite conflict#1
Merged
ParticleTroned merged 3 commits intoMay 16, 2026
Conversation
|
No actionable suggestions for changed features. |
|
✅ A pre-release build is available for this PR: |
ParticleTroned
force-pushed
the
cs-1.4.11-PL-VR
branch
from
7ce918a to
5178a6f
Compare
ParticleTroned
merged commit 0841620
into
ParticleTroned:cs-1.4.11-PL-VR
7 checks passed
ParticleTroned
added a commit
that referenced
this pull request
May 16, 2026
* fix(upscaling): guard OpenComposite conflict * fix(ci): locate VS 2026 toolchain --------- Co-authored-by: ParticleTroned <248299730+ParticleTroned@users.noreply.github.com>
ParticleTroned
added a commit
that referenced
this pull request
May 16, 2026
* fix(upscaling): guard OpenComposite conflict * fix(ci): locate VS 2026 toolchain --------- Co-authored-by: ParticleTroned <248299730+ParticleTroned@users.noreply.github.com>
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
2 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.
Summary
Testing