fix merge conflicts

Browse source

...

This commit is contained in:

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

parent 518f8fd55e d3f79cf464

commit 1116b1de16

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