Fixed merge conflicts

Browse Source

...

This commit is contained in:

arcadius3d

2017-06-15 21:51:07 -03:00

parent 220bc7149b

commit 912c21cc2c

5 changed files with 22 additions and 40 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

img/tools/StandardNotes.png Normal file

Binary file not shown.

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