Fixed merge conflict

Browse Source

...

This commit is contained in:

Nabin Hait

2016-10-31 16:38:09 +05:30

parent c851d24b2c 6ece870b6e

commit 551360ae30

15 changed files with 91 additions and 24 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/change-amount.png Normal file

Binary file not shown.

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

BIN

erpnext/docs/assets/img/accounts/offline-records.png Normal file

Binary file not shown.

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

BIN

erpnext/docs/assets/img/accounts/pos-item.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 143 KiB After Width:  |  Height:  |  Size: 226 KiB

BIN

erpnext/docs/assets/img/accounts/pos-payment.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 46 KiB After Width:  |  Height:  |  Size: 55 KiB

BIN

erpnext/docs/assets/img/accounts/write-off.png Normal file

Binary file not shown.

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

BIN

erpnext/docs/assets/img/articles/price-list.png Normal file

Binary file not shown.

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

BIN

erpnext/docs/assets/img/articles/pricing-rule-invoice.png Normal file

Binary file not shown.

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

BIN

erpnext/docs/assets/img/articles/pricing-rule-margin.png Normal file

Binary file not shown.

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