mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-02-23 19:49:43 +01:00
Resolve merge conflicts: - expect.txt: Keep both Chunghwa/CIBUILD, powerdisplay/POWERBROADCAST, Staticedge/staticmethod - CustomAction.cpp: Update array size to 44 (include both PowerDisplay and ZoomIt) - QuickAccessViewModel.cs: Keep both LightSwitch and PowerDisplay modules - LightSwitchPage.xaml.cs: Use correct degree symbol encoding - LightSwitchViewModel.cs: Merge PowerDisplay using statements with GPO wrapper, add settingsRepository parameter