Fixing merge conflicts

Browse Source

...

This commit is contained in:

LizRoss

2016-07-28 14:32:38 -07:00

parent 43f3f63fea 9bbe581710

commit 4ea607e2a7

58 changed files with 1518 additions and 1601 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

BIN

windows/deploy/images/check_blu.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 20 KiB