fixed merge

Browse source

...

This commit is contained in:

csoler 2018-05-11 20:28:53 +02:00

parent ecbd115873

commit 57cff61873

No known key found for this signature in database

GPG key ID: 7BCA522266C0804C

2 changed files with 18 additions and 6 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