fix merge conflicts

Browse source

...

This commit is contained in:

Maurits Lourens 2021-09-16 22:21:41 +02:00

parent 104a84d19b bede089cbe

commit c009ec4b59

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