Resolve merge conflict

Browse Source

...

This commit is contained in:

Artem Homenko 2017-02-06 15:24:08 +02:00

parent e59e2c4cca

commit 8ff378d730

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