Fixed conflict (newline)

Browse Source

...

This commit is contained in:

Shay Nehmad 2019-10-06 20:16:44 +03:00

parent 2dec2e6a70 3bf5f402f3

commit 1ddc9fb3ef

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