Fix merge conflict

Browse Source

...

This commit is contained in:

Cole Bemis 2017-02-27 20:58:04 -08:00

parent 615bdd05d7 809043c9d4

commit fcb9913ec3

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