Skip to content

Resolve merge conflict master and staging. #5849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
michelinewu wants to merge 7 commits into
base: staging
Choose a base branch
from
+1 −1

Resolve merge conflict between master and staging.

e7157d1
Select commit
Loading
Failed to load commit list.
Open

Resolve merge conflict master and staging. #5849

Resolve merge conflict between master and staging.
e7157d1
Select commit
Loading
Failed to load commit list.
Azure Pipelines / streamlabs.desktop (macOS) succeeded Apr 17, 2026 in 5m 25s

macOS succeeded

0 errors / 0 warnings

View more details on Azure Pipelines