fix conflict due to indentation

Browse Source

pull/110/head

borntofrappe 6 years ago

parent 19991312af 2ee64fb23d

commit 1af6523866

1 changed files with 13 additions and 13 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

Write Preview

Loading…

Cancel

Save