Merge conflict resolved

Browse Source

...

This commit is contained in:

Simon Hensch

2025-09-16 16:15:29 +02:00

parent 72b1ce7ae0 26b9b7d7d7

commit fb52b3860c

1 changed files with 1 additions and 1 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