fixing the conflicts

Browse Source

pull/3042/head

iamAdrianIusca 2020-03-09 22:23:18 +02:00

parent 18cb5745bc

commit 691dfe7012

1 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