Merge pull request #14030 from saurabh6790/field_fixes

Browse Source

remove duplicate fields occurred due to merge conflicts

...

This commit is contained in:

Saurabh 2018-05-14 22:14:17 +05:30 committed by GitHub

parent 4f2e39cd09 99400bd958

commit ff85c49330

No known key found for this signature in database

GPG Key ID: 4AEE18F83AFDEB23

1 changed files with 0 additions and 3210 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

3210

erpnext/stock/doctype/item/item.json

File diff suppressed because it is too large Load Diff