Resolve merge conflict with master

Browse Source

+ added name back to contributor list

...

This commit is contained in:

Cameron Schermerhorn 2015-10-09 13:31:48 -04:00

parent d2010c0860

commit 35e89f86fe

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