fix conflict

Browse Source

...

This commit is contained in:

Sambhaji Kolate 2014-09-15 12:31:44 +05:30

parent 4d3a18890b

commit d14e15d432

2 changed files with 1580 additions and 1823 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1827

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json

File diff suppressed because it is too large Load Diff

1576

erpnext/buying/doctype/purchase_order/purchase_order.json

File diff suppressed because it is too large Load Diff