Fixed merge conflict

Browse Source

...

This commit is contained in:

Nabin Hait

2016-11-21 19:13:22 +05:30

parent 4374ef5adc 8132be288f

commit d855167b9b

45 changed files with 798 additions and 248 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/buying/add_taxes_to_doc.png Normal file

Binary file not shown.

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

BIN

erpnext/docs/assets/img/buying/buying_flow.png Normal file

Binary file not shown.

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

BIN

erpnext/docs/assets/img/buying/show_tax_breakup.png Normal file

Binary file not shown.

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