Fix merge spacing from conflicted merge

Browse Source

...

This commit is contained in:

Matthew Jones

2014-01-30 01:04:17 -05:00

parent 82b692be9c

commit 6ff98d87e9

3 changed files with 5 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files