Fixed merge conflict

Browse source

...

This commit is contained in:

boltgolt 2018-04-14 00:11:39 +02:00

parent 21d6616b42 46e054765c

commit 3f7ab7de8c

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

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