Fixed merge conflict

Browse Source

...

This commit is contained in:

Nabin Hait

2016-10-07 16:53:07 +05:30

parent cf8438d153 f69edb3fa3

commit cd9c45f816

18 changed files with 174 additions and 37 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

erpnext/docs/assets/img/accounts/account-settings.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 95 KiB After Width:  |  Height:  |  Size: 102 KiB

BIN

erpnext/docs/assets/img/accounts/journal-entry.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 96 KiB After Width:  |  Height:  |  Size: 82 KiB