Fixed merge conflict

Browse Source

...

This commit is contained in:

Nabin Hait

2016-10-18 15:37:33 +05:30

parent 2dcee15e50 a1099d28b8

commit fa1cdd5bf0

30 changed files with 412 additions and 377 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/fiscal-year.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 52 KiB After Width:  |  Height:  |  Size: 38 KiB

BIN

erpnext/docs/assets/img/buying/material-request-flowchart.png Normal file

Binary file not shown.

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

BIN

erpnext/docs/assets/img/buying/material-request.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 52 KiB After Width:  |  Height:  |  Size: 47 KiB