info: fix conflicts formatting.

Browse Source

...

This commit is contained in:

Mike McQuaid 2017-05-16 10:04:15 +01:00

parent aeaf9af711

commit 2b726383f1

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