fix merge conflict

Browse source

...

This commit is contained in:

Bert van der Weerd 2023-05-11 14:10:42 +02:00

parent ab018ea341 d3385ccd8f

commit a29404f692

2 changed files with 2 additions and 2 deletions

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

Show stats Download patch file Download diff file Expand all files Collapse all files