fix merge issues

Browse Source

...

This commit is contained in:

proddy

2026-04-15 20:37:33 +02:00

parent 6b31fef1af

commit def5173692

2 changed files with 3959 additions and 3877 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

6684

src/core/system.cpp

File diff suppressed because it is too large Load Diff

1086

src/web/WebSettingsService.cpp

File diff suppressed because it is too large Load Diff